From: Philip Warner <[EMAIL PROTECTED]> Date: Sun, 16 Jul 2000 20:49:35 +1000 Hi Philip, > Another update of the dump code; this fixes a few bugs that people without > zlib under 7.02 would have experienced. Also, if you wish to use zlib, you > need to modify the Makefile to add -DHAVE_LIBZ to the CFLAGS.... please apply attached patch for 7.0.2 version. It is long, but it only removes Makefile and creates Makefile.in which can be used for 7.0.2. With this patch applied, just untar the newest snapshot to src/bin/pg_dump and you can continue with normal installation: configure && make && make install. Thank you for good work. -- Pavel Janík ml. [EMAIL PROTECTED]
diff -uN pg_dump_141.orig/Makefile pg_dump_141/Makefile --- pg_dump_141.orig/Makefile Wed Jul 19 10:53:31 2000 +++ pg_dump_141/Makefile Thu Jan 1 01:00:00 1970 @@ -1,64 +0,0 @@ -#------------------------------------------------------------------------- -# -# Makefile for src/bin/pg_dump -# -# Copyright (c) 1994, Regents of the University of California -# -# $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.19 2000/07/04 19:52:00 petere Exp $ -# -#------------------------------------------------------------------------- - -subdir = src/bin/pg_dump -top_builddir = ../../.. - -SRCDIR= ../.. -include ../../Makefile.global - -OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o pg_backup_files.o \ - pg_backup_null.o pg_backup_tar.o $(STRDUP) - -CFLAGS+= -I$(LIBPQDIR) -LIBS+= -lz - -all: submake pg_dump pg_restore pg_dumpall - -pg_dump: pg_dump.o common.o $(OBJS) $(LIBPQDIR)/libpq.a - $(CC) $(CFLAGS) -o $@ pg_dump.o common.o $(OBJS) $(LIBPQ) $(LDFLAGS) - -pg_restore: pg_restore.o $(OBJS) $(LIBPQDIR)/libpq.a - $(CC) $(CFLAGS) -o $@ pg_restore.o $(OBJS) $(LIBPQ) $(LDFLAGS) - -../../utils/strdup.o: - $(MAKE) -C ../../utils strdup.o - -pg_dumpall: pg_dumpall.sh - sed -e 's:__VERSION__:$(VERSION):g' \ - -e 's:__MULTIBYTE__:$(MULTIBYTE):g' \ - -e 's:__bindir__:$(bindir):g' \ - < $< > $@ - -.PHONY: submake -submake: - $(MAKE) -C $(LIBPQDIR) all - -install: all installdirs - $(INSTALL_PROGRAM) pg_dump$(X) $(bindir)/pg_dump$(X) - $(INSTALL_PROGRAM) pg_restore$(X) $(bindir)/pg_restore$(X) - $(INSTALL_SCRIPT) pg_dumpall $(bindir)/pg_dumpall - $(INSTALL_SCRIPT) pg_upgrade $(bindir)/pg_upgrade - -installdirs: - $(mkinstalldirs) $(bindir) - -uninstall: - rm -f $(addprefix $(bindir)/, pg_dump$(X) pg_restore$(X) pg_dumpall pg_upgrade) - -depend dep: - $(CC) -MM $(CFLAGS) *.c >depend - -clean distclean maintainer-clean: - rm -f pg_dump$(X) pg_restore$(X) $(OBJS) pg_dump.o common.o pg_restore.o pg_dumpall - -ifeq (depend,$(wildcard depend)) -include depend -endif diff -uN pg_dump_141.orig/Makefile.in pg_dump_141/Makefile.in --- pg_dump_141.orig/Makefile.in Thu Jan 1 01:00:00 1970 +++ pg_dump_141/Makefile.in Wed Jul 19 10:45:08 2000 @@ -0,0 +1,55 @@ +#------------------------------------------------------------------------- +# +# Makefile for src/bin/pg_dump +# +# Copyright (c) 1994, Regents of the University of California +# +# $Header: /home/projects/pgsql/cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.19 2000/07/04 19:52:00 petere Exp $ +# +#------------------------------------------------------------------------- + +SRCDIR= ../.. +include ../../Makefile.global + +OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o pg_backup_files.o \ + pg_backup_null.o pg_backup_tar.o @STRDUP@ + +CFLAGS+= -I$(LIBPQDIR) +LIBS+= -lz + +all: submake pg_dump pg_restore pg_dumpall + +pg_dump: pg_dump.o common.o $(OBJS) $(LIBPQDIR)/libpq.a + $(CC) $(CFLAGS) -o $@ pg_dump.o common.o $(OBJS) $(LIBPQ) $(LDFLAGS) + +pg_restore: pg_restore.o $(OBJS) $(LIBPQDIR)/libpq.a + $(CC) $(CFLAGS) -o $@ pg_restore.o $(OBJS) $(LIBPQ) $(LDFLAGS) + +../../utils/strdup.o: + $(MAKE) -C ../../utils strdup.o + +pg_dumpall: pg_dumpall.sh + sed -e 's:__VERSION__:$(VERSION):g' \ + -e 's:__MULTIBYTE__:$(MULTIBYTE):g' \ + -e 's:__bindir__:$(bindir):g' \ + < $< > $@ + +.PHONY: submake +submake: + $(MAKE) -C $(LIBPQDIR) all + +install: all + $(INSTALL) $(INSTL_EXE_OPTS) pg_dump$(X) $(BINDIR)/pg_dump$(X) + $(INSTALL) $(INSTL_EXE_OPTS) pg_restore$(X) $(BINDIR)/pg_restore$(X) + $(INSTALL) $(INSTL_EXE_OPTS) pg_dumpall $(BINDIR)/pg_dumpall + $(INSTALL) $(INSTL_EXE_OPTS) pg_upgrade $(BINDIR)/pg_upgrade + +depend dep: + $(CC) -MM $(CFLAGS) *.c >depend + +clean: + rm -f pg_dump$(X) pg_restore$(X) $(OBJS) pg_dump.o common.o pg_restore.o pg_dumpall + +ifeq (depend,$(wildcard depend)) +include depend +endif
