Commit1ef38f2

committed

In a PGXS build, expect to find the postgres executable already installed,

rather than in $(top_builddir)/src/backend/postgres. Sean Chittenden

1 parent480777e commit1ef38f2Copy full SHA for 1ef38f2

File tree

+21

-4

lines changed

+21

-4

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,11 @@ DLSUFFIX = .so`
`9`	`9`	`CFLAGS_SL = -fpic -DPIC`
`10`	`10`
`11`	`11`	`%.so: %.o`
`12`		`-ln -fs $(top_srcdir)/src/backend/postgres _APP_`
	`12`	`+ifdef PGXS`
	`13`	`+ln -fs $(DESTDIR)$(bindir)/postgres _APP_`
	`14`	`+else`
	`15`	`+ln -fs $(top_builddir)/src/backend/postgres _APP_`
	`16`	`+endif`
`13`	`17`	`$(CC) -nostart -Xlinker -soname=$@ -o $@ _APP_ $<`
`14`	`18`
`15`	`19`	`sqlmansect = 7`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,11 @@`
`1`		`-# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.5 2004/10/27 19:14:07 momjian Exp $`
	`1`	`+# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.6 2004/12/17 03:52:48 tgl Exp $`
`2`	`2`	`DLLTOOL= dlltool`
`3`	`3`	`DLLWRAP= dllwrap`
	`4`	`+ifdef PGXS`
	`5`	`+BE_DLLLIBS= -L$(DESTDIR)$(bindir) -lpostgres`
	`6`	`+else`
`4`	`7`	`BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres`
	`8`	`+endif`
`5`	`9`	`DLLINIT = $(top_builddir)/src/utils/dllinit.o`
`6`	`10`
`7`	`11`	`# linking with -lm or -lc causes program to crash`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,13 @@ AWK= awk`
`3`	`3`
`4`	`4`	`DLSUFFIX = .so`
`5`	`5`	`CFLAGS_SL =`
	`6`	`+`
	`7`	`+ifdef PGXS`
	`8`	`+BE_DLLLIBS= -bundle_loader $(DESTDIR)$(bindir)/postgres`
	`9`	`+else`
`6`	`10`	`BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres`
`7`		`-`
	`11`	`+endif`
	`12`	`+`
`8`	`13`	`# Rule for building shared libs (currently used only for regression test`
`9`	`14`	`# shlib ... should go away, since this is not really enough knowledge)`
`10`	`15`	`%.so: %.o`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,15 @@`
`1`		`-# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.6 2004/11/1717:16:17 tgl Exp $`
	`1`	`+# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.7 2004/12/1703:52:49 tgl Exp $`
`2`	`2`
`3`	`3`	`# Use replacement include files for those missing on Win32`
`4`	`4`	`override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"`
`5`	`5`
`6`	`6`	`DLLTOOL= dlltool`
`7`	`7`	`DLLWRAP= dllwrap`
	`8`	`+ifdef PGXS`
	`9`	`+BE_DLLLIBS= -L$(DESTDIR)$(bindir) -lpostgres`
	`10`	`+else`
`8`	`11`	`BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres`
	`12`	`+endif`
`9`	`13`	`DLLINIT = $(top_builddir)/src/utils/dllinit.o`
`10`	`14`
`11`	`15`	`AROPT = crs`

Comments

(0)