Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1ef38f2

Browse files
committed
In a PGXS build, expect to find the postgres executable already installed,
rather than in $(top_builddir)/src/backend/postgres. Sean Chittenden
1 parent 480777e commit 1ef38f2

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed

src/makefiles/Makefile.beos

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ DLSUFFIX = .so
99
CFLAGS_SL = -fpic -DPIC
1010

1111
%.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
1317
$(CC) -nostart -Xlinker -soname=$@ -o $@ _APP_ $<
1418

1519
sqlmansect = 7

src/makefiles/Makefile.cygwin

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff 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 $
22
DLLTOOL= dlltool
33
DLLWRAP= dllwrap
4+
ifdef PGXS
5+
BE_DLLLIBS= -L$(DESTDIR)$(bindir) -lpostgres
6+
else
47
BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
8+
endif
59
DLLINIT = $(top_builddir)/src/utils/dllinit.o
610

711
# linking with -lm or -lc causes program to crash

src/makefiles/Makefile.darwin

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@ AWK= awk
33

44
DLSUFFIX = .so
55
CFLAGS_SL =
6+
7+
ifdef PGXS
8+
BE_DLLLIBS= -bundle_loader $(DESTDIR)$(bindir)/postgres
9+
else
610
BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
7-
11+
endif
12+
813
# Rule for building shared libs (currently used only for regression test
914
# shlib ... should go away, since this is not really enough knowledge)
1015
%.so: %.o

src/makefiles/Makefile.win32

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.6 2004/11/17 17:16:17 tgl Exp $
1+
# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.7 2004/12/17 03:52:49 tgl Exp $
22

33
# Use replacement include files for those missing on Win32
44
override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
55

66
DLLTOOL= dlltool
77
DLLWRAP= dllwrap
8+
ifdef PGXS
9+
BE_DLLLIBS= -L$(DESTDIR)$(bindir) -lpostgres
10+
else
811
BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
12+
endif
913
DLLINIT = $(top_builddir)/src/utils/dllinit.o
1014

1115
AROPT = crs

0 commit comments

Comments
 (0)