diff options
| author | Neil Conway <neilc@samurai.com> | 2004-10-12 04:48:36 +0000 |
|---|---|---|
| committer | Neil Conway <neilc@samurai.com> | 2004-10-12 04:48:36 +0000 |
| commit | 0b112045b7a410822d909c5ee361b88005b7963f (patch) | |
| tree | e144819ade36909cd88e47d5207d6c091417b533 /src | |
| parent | d7099647798fbacb08698d1373f5c49e933585ac (diff) | |
| download | postgresql-0b112045b7a410822d909c5ee361b88005b7963f.tar.gz postgresql-0b112045b7a410822d909c5ee361b88005b7963f.zip | |
Fix vpath build break, induced by Bruce's recent commit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.shlib | 6 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/Makefile | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/Makefile | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 2fbc4b7595c..1009b27d081 100644 --- 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 index 7868929abac..13cd6207aca 100644 --- 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 index 9a1a8d81986..e8a418c92b0 100644 --- 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 |