Commit0b11204

Neil Conway

committed

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

1 parentd709964 commit0b11204Copy full SHA for 0b11204

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# Copyright (c) 1998, Regents of the University of California`
`7`	`7`	`#`
`8`	`8`	`# IDENTIFICATION`
`9`		`-# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.80 2004/10/1201:04:09 momjian Exp $`
	`9`	`+# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.81 2004/10/12 04:48:34 neilc Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -245,9 +245,9 @@ endif # enable_shared`
`245`	`245`
`246`	`246`	`all-lib: all-static-lib all-shared-lib`
`247`	`247`
`248`		`-all-static-lib: $(PTHREAD_H_WIN32) $(top_srcdir)/src/port/pg_config_paths.h lib$(NAME).a`
	`248`	`+all-static-lib: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h lib$(NAME).a`
`249`	`249`
`250`		`-all-shared-lib: $(PTHREAD_H_WIN32) $(top_srcdir)/src/port/pg_config_paths.h $(shlib)`
	`250`	`+all-shared-lib: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h $(shlib)`
`251`	`251`
`252`	`252`	`ifneq ($(PORTNAME), cygwin)`
`253`	`253`	`ifneq ($(PORTNAME), win32)`

Lines changed: 2 additions & 2 deletions

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/1201: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`

Lines changed: 2 additions & 2 deletions

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/1201: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`

Comments

(0)