Commit 1ef38f26 authored by Tom Lane's avatar Tom Lane

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

rather than in $(top_builddir)/src/backend/postgres.  Sean Chittenden
parent 480777e5
...@@ -9,7 +9,11 @@ DLSUFFIX = .so ...@@ -9,7 +9,11 @@ DLSUFFIX = .so
CFLAGS_SL = -fpic -DPIC CFLAGS_SL = -fpic -DPIC
%.so: %.o %.so: %.o
ln -fs $(top_srcdir)/src/backend/postgres _APP_ ifdef PGXS
ln -fs $(DESTDIR)$(bindir)/postgres _APP_
else
ln -fs $(top_builddir)/src/backend/postgres _APP_
endif
$(CC) -nostart -Xlinker -soname=$@ -o $@ _APP_ $< $(CC) -nostart -Xlinker -soname=$@ -o $@ _APP_ $<
sqlmansect = 7 sqlmansect = 7
# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.5 2004/10/27 19:14:07 momjian Exp $ # $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.6 2004/12/17 03:52:48 tgl Exp $
DLLTOOL= dlltool DLLTOOL= dlltool
DLLWRAP= dllwrap DLLWRAP= dllwrap
ifdef PGXS
BE_DLLLIBS= -L$(DESTDIR)$(bindir) -lpostgres
else
BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
endif
DLLINIT = $(top_builddir)/src/utils/dllinit.o DLLINIT = $(top_builddir)/src/utils/dllinit.o
# linking with -lm or -lc causes program to crash # linking with -lm or -lc causes program to crash
......
...@@ -3,8 +3,13 @@ AWK= awk ...@@ -3,8 +3,13 @@ AWK= awk
DLSUFFIX = .so DLSUFFIX = .so
CFLAGS_SL = CFLAGS_SL =
ifdef PGXS
BE_DLLLIBS= -bundle_loader $(DESTDIR)$(bindir)/postgres
else
BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
endif
# Rule for building shared libs (currently used only for regression test # Rule for building shared libs (currently used only for regression test
# shlib ... should go away, since this is not really enough knowledge) # shlib ... should go away, since this is not really enough knowledge)
%.so: %.o %.so: %.o
......
# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.6 2004/11/17 17:16:17 tgl Exp $ # $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.7 2004/12/17 03:52:49 tgl Exp $
# Use replacement include files for those missing on Win32 # Use replacement include files for those missing on Win32
override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32" override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
DLLTOOL= dlltool DLLTOOL= dlltool
DLLWRAP= dllwrap DLLWRAP= dllwrap
ifdef PGXS
BE_DLLLIBS= -L$(DESTDIR)$(bindir) -lpostgres
else
BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
endif
DLLINIT = $(top_builddir)/src/utils/dllinit.o DLLINIT = $(top_builddir)/src/utils/dllinit.o
AROPT = crs AROPT = crs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment