aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2006-01-19 20:45:34 +0000
committerBruce Momjian <bruce@momjian.us>2006-01-19 20:45:34 +0000
commit128cd9df385d90a40c46dd277def9f17e571339e (patch)
tree4bec8aeabac5a6bd0170c1acea6c19d1ab53b96f
parentab2cd7266b945ddf411434a193c4b81079d0f957 (diff)
downloadpostgresql-128cd9df385d90a40c46dd277def9f17e571339e.tar.gz
postgresql-128cd9df385d90a40c46dd277def9f17e571339e.zip
Remove $(DESTDIR) from the pgxs BE_DLLLIBS= -L path.
-rw-r--r--src/makefiles/Makefile.cygwin4
-rw-r--r--src/makefiles/Makefile.win324
2 files changed, 4 insertions, 4 deletions
diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin
index 6d172619287..3db2756bd5c 100644
--- a/src/makefiles/Makefile.cygwin
+++ b/src/makefiles/Makefile.cygwin
@@ -1,8 +1,8 @@
-# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.6.6.1 2006/01/19 20:01:01 momjian Exp $
+# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.6.6.2 2006/01/19 20:45:34 momjian Exp $
DLLTOOL= dlltool
DLLWRAP= dllwrap
ifdef PGXS
-BE_DLLLIBS= -L$(DESTDIR)$(libdir) -lpostgres
+BE_DLLLIBS= -L$(libdir) -lpostgres
else
BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
endif
diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32
index d1819b39953..080d762b752 100644
--- a/src/makefiles/Makefile.win32
+++ b/src/makefiles/Makefile.win32
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.7.6.1 2006/01/19 20:01:01 momjian Exp $
+# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.7.6.2 2006/01/19 20:45:34 momjian Exp $
# Use replacement include files for those missing on Win32
override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
@@ -6,7 +6,7 @@ override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32"
DLLTOOL= dlltool
DLLWRAP= dllwrap
ifdef PGXS
-BE_DLLLIBS= -L$(DESTDIR)$(libdir) -lpostgres
+BE_DLLLIBS= -L$(libdir) -lpostgres
else
BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
endif