I don't think so :-(.  Didn't you just break building things on a
machine where Postgres isn't already installed?


Wait, are you suggesting that pgxs is used pre-install?  I sure hope
not.

It isn't, but your patch changes make variables (to wit, BE_DLLLIBS) that are used during the standard build process.

Attached is the easiest and least intrusive fix. This fixes all scenarios as far as I can tell. -sc


Index: Makefile.beos
===================================================================
RCS file: /projects/cvsroot/pgsql/src/makefiles/Makefile.beos,v
retrieving revision 1.6
diff -u -r1.6 Makefile.beos
--- Makefile.beos       29 Aug 2001 19:14:40 -0000      1.6
+++ Makefile.beos       17 Dec 2004 03:24:08 -0000
@@ -9,7 +9,11 @@
 CFLAGS_SL = -fpic -DPIC
 
 %.so: %.o
+ifdef PGXS
+       ln -fs $(DESTDIR)$(bindir)/postgres _APP_
+else
        ln -fs $(top_srcdir)/src/backend/postgres _APP_
+endif
        $(CC) -nostart -Xlinker -soname=$@ -o $@ _APP_ $<
 
 sqlmansect = 7
Index: Makefile.cygwin
===================================================================
RCS file: /projects/cvsroot/pgsql/src/makefiles/Makefile.cygwin,v
retrieving revision 1.5
diff -u -r1.5 Makefile.cygwin
--- Makefile.cygwin     27 Oct 2004 19:14:07 -0000      1.5
+++ Makefile.cygwin     17 Dec 2004 03:24:08 -0000
@@ -1,7 +1,11 @@
 # $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.5 2004/10/27 19:14:07 
momjian Exp $
 DLLTOOL= dlltool
 DLLWRAP= dllwrap
+ifdef PGXS
+BE_DLLLIBS= -L$(DESTDIR)$(bindir) -lpostgres
+else
 BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
+endif
 DLLINIT = $(top_builddir)/src/utils/dllinit.o
 
 # linking with -lm or -lc causes program to crash
Index: Makefile.darwin
===================================================================
RCS file: /projects/cvsroot/pgsql/src/makefiles/Makefile.darwin,v
retrieving revision 1.7
diff -u -r1.7 Makefile.darwin
--- Makefile.darwin     27 Oct 2003 07:42:34 -0000      1.7
+++ Makefile.darwin     17 Dec 2004 03:24:09 -0000
@@ -3,8 +3,13 @@
  
 DLSUFFIX = .so
 CFLAGS_SL =
+
+ifdef PGXS
+BE_DLLLIBS= -bundle_loader $(DESTDIR)$(bindir)/postgres
+else
 BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
- 
+endif
+
 # Rule for building shared libs (currently used only for regression test
 # shlib ... should go away, since this is not really enough knowledge)
 %.so: %.o
Index: Makefile.win32
===================================================================
RCS file: /projects/cvsroot/pgsql/src/makefiles/Makefile.win32,v
retrieving revision 1.6
diff -u -r1.6 Makefile.win32
--- Makefile.win32      17 Nov 2004 17:16:17 -0000      1.6
+++ Makefile.win32      17 Dec 2004 03:24:09 -0000
@@ -5,7 +5,11 @@
 
 DLLTOOL= dlltool
 DLLWRAP= dllwrap
+ifdef PGXS
+BE_DLLLIBS= -L$(DESTDIR)$(bindir) -lpostgres
+else
 BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
+endif
 DLLINIT = $(top_builddir)/src/utils/dllinit.o
 
 AROPT = crs


--
Sean Chittenden
---------------------------(end of broadcast)---------------------------
TIP 7: don't forget to increase your free space map settings

Reply via email to