This patch fixes a build break for vpath builds, introduced by Bruce's
recent commit.

Barring any objections I intend to apply this in a few hours.

-Neil

Index: src/Makefile.shlib
===================================================================
RCS file: /var/lib/cvs/pgsql/src/Makefile.shlib,v
retrieving revision 1.80
diff -c -r1.80 Makefile.shlib
*** src/Makefile.shlib	12 Oct 2004 01:04:09 -0000	1.80
--- src/Makefile.shlib	12 Oct 2004 02:33:31 -0000
***************
*** 245,253 ****
  
  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-shared-lib: $(PTHREAD_H_WIN32) $(top_srcdir)/src/port/pg_config_paths.h $(shlib)
  
  ifneq ($(PORTNAME), cygwin)
  ifneq ($(PORTNAME), win32)
--- 245,253 ----
  
  all-lib: all-static-lib all-shared-lib
  
! all-static-lib: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h lib$(NAME).a
  
! all-shared-lib: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h $(shlib)
  
  ifneq ($(PORTNAME), cygwin)
  ifneq ($(PORTNAME), win32)
Index: src/interfaces/ecpg/ecpglib/Makefile
===================================================================
RCS file: /var/lib/cvs/pgsql/src/interfaces/ecpg/ecpglib/Makefile,v
retrieving revision 1.27
diff -c -r1.27 Makefile
*** src/interfaces/ecpg/ecpglib/Makefile	12 Oct 2004 01:04:10 -0000	1.27
--- src/interfaces/ecpg/ecpglib/Makefile	12 Oct 2004 02:32:18 -0000
***************
*** 30,36 ****
  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
  
  # Shared library stuff
  include $(top_srcdir)/src/Makefile.shlib
--- 30,36 ----
  SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) \
  	$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(PTHREAD_LIBS)
  
! all: $(top_builddir)/src/port/pg_config_paths.h all-lib
  
  # Shared library stuff
  include $(top_srcdir)/src/Makefile.shlib
Index: src/interfaces/libpq/Makefile
===================================================================
RCS file: /var/lib/cvs/pgsql/src/interfaces/libpq/Makefile,v
retrieving revision 1.116
diff -c -r1.116 Makefile
*** src/interfaces/libpq/Makefile	12 Oct 2004 01:04:11 -0000	1.116
--- src/interfaces/libpq/Makefile	12 Oct 2004 02:31:51 -0000
***************
*** 51,57 ****
  endif
  
  
! all: $(PTHREAD_H_WIN32) $(top_srcdir)/src/port/pg_config_paths.h all-lib
  
  # Shared library stuff
  include $(top_srcdir)/src/Makefile.shlib
--- 51,57 ----
  endif
  
  
! all: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h all-lib
  
  # Shared library stuff
  include $(top_srcdir)/src/Makefile.shlib
---------------------------(end of broadcast)---------------------------
TIP 2: you can get off all lists at once with the unregister command
    (send "unregister YourEmailAddressHere" to [EMAIL PROTECTED])

Reply via email to