From 1ef38f26919bec1b9d4b4a9273dec4d992a88040 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 17 Dec 2004 03:52:49 +0000
Subject: [PATCH] In a PGXS build, expect to find the postgres executable
 already installed, rather than in $(top_builddir)/src/backend/postgres.  Sean
 Chittenden

---
 src/makefiles/Makefile.beos   | 6 +++++-
 src/makefiles/Makefile.cygwin | 6 +++++-
 src/makefiles/Makefile.darwin | 7 ++++++-
 src/makefiles/Makefile.win32  | 6 +++++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/makefiles/Makefile.beos b/src/makefiles/Makefile.beos
index 7c79bcecd9..83855f0cc3 100644
--- a/src/makefiles/Makefile.beos
+++ b/src/makefiles/Makefile.beos
@@ -9,7 +9,11 @@ DLSUFFIX = .so
 CFLAGS_SL = -fpic -DPIC
 
 %.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_ $<
 
 sqlmansect = 7
diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin
index 3de1644e2e..a441d78a60 100644
--- a/src/makefiles/Makefile.cygwin
+++ b/src/makefiles/Makefile.cygwin
@@ -1,7 +1,11 @@
-# $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
 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
diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
index cad692dc4c..9d823a76a8 100644
--- a/src/makefiles/Makefile.darwin
+++ b/src/makefiles/Makefile.darwin
@@ -3,8 +3,13 @@ AWK= awk
  
 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
diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32
index 92d6ce2e2c..ae431b5a28 100644
--- a/src/makefiles/Makefile.win32
+++ b/src/makefiles/Makefile.win32
@@ -1,11 +1,15 @@
-# $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
 override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
 
 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