Fix vpath build break, induced by Bruce's recent commit.

Neil Conway · Neil Conway · commit 0b112045b7a4 · 2004-10-12T04:48:36.000Z
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
@@ -6,7 +6,7 @@
 # Copyright (c) 1998, Regents of the University of California
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/Makefile.shlib,v 1.80 2004/10/12 01:04:09 momjian Exp $
+#    $PostgreSQL: pgsql/src/Makefile.shlib,v 1.81 2004/10/12 04:48:34 neilc Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -245,9 +245,9 @@ endif # enable_shared
 
 all-lib: all-static-lib all-shared-lib
 
-all-static-lib: $(PTHREAD_H_WIN32) $(top_srcdir)/src/port/pg_config_paths.h lib$(NAME).a
+all-static-lib: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h lib$(NAME).a
 
-all-shared-lib: $(PTHREAD_H_WIN32) $(top_srcdir)/src/port/pg_config_paths.h $(shlib)
+all-shared-lib: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h $(shlib)
 
 ifneq ($(PORTNAME), cygwin)
 ifneq ($(PORTNAME), win32)
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.27 2004/10/12 01:04:10 momjian Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.28 2004/10/12 04:48:35 neilc Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -30,7 +30,7 @@ OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
 SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) \
 	$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(PTHREAD_LIBS)
 
-all: $(top_srcdir)/src/port/pg_config_paths.h all-lib
+all: $(top_builddir)/src/port/pg_config_paths.h all-lib
 
 # Shared library stuff
 include $(top_srcdir)/src/Makefile.shlib
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.116 2004/10/12 01:04:11 momjian Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.117 2004/10/12 04:48:36 neilc Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -51,7 +51,7 @@ SHLIB_LINK += -lwsock32 -lws2_32 $(filter -leay32 -lssleay32, $(LIBS))
 endif
 
 
-all: $(PTHREAD_H_WIN32) $(top_srcdir)/src/port/pg_config_paths.h all-lib
+all: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h all-lib
 
 # Shared library stuff
 include $(top_srcdir)/src/Makefile.shlib

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.27 2004/10/12 01:04:10 momjian Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.28 2004/10/12 04:48:35 neilc Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -30,7 +30,7 @@ OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \`
`30`	`30`	`SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) \`
`31`	`31`	`$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(PTHREAD_LIBS)`
`32`	`32`
`33`		`-all: $(top_srcdir)/src/port/pg_config_paths.h all-lib`
	`33`	`+all: $(top_builddir)/src/port/pg_config_paths.h all-lib`
`34`	`34`
`35`	`35`	`# Shared library stuff`
`36`	`36`	`include $(top_srcdir)/src/Makefile.shlib`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.116 2004/10/12 01:04:11 momjian Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.117 2004/10/12 04:48:36 neilc Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -51,7 +51,7 @@ SHLIB_LINK += -lwsock32 -lws2_32 $(filter -leay32 -lssleay32, $(LIBS))`
`51`	`51`	`endif`
`52`	`52`
`53`	`53`
`54`		`-all: $(PTHREAD_H_WIN32) $(top_srcdir)/src/port/pg_config_paths.h all-lib`
	`54`	`+all: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h all-lib`
`55`	`55`
`56`	`56`	`# Shared library stuff`
`57`	`57`	`include $(top_srcdir)/src/Makefile.shlib`