From b5e2dafd397b8011c17fd6553c8d1a2b91fd978a Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 4 Jul 2000 19:52:00 +0000
Subject: [PATCH] Fix broken pg_dump makefile
---
src/bin/pg_dump/Makefile | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index 99681fc7369..4f03eb3f255 100644
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.18 2000/07/04 14:25:26 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.19 2000/07/04 19:52:00 petere Exp $
#
#-------------------------------------------------------------------------
@@ -16,19 +16,25 @@ OBJS= pg_backup_archiver.o pg_backup_custom.o pg_backup_files.o \
pg_backup_plain_text.o $(STRDUP)
CFLAGS+= -I$(LIBPQDIR)
-LDFLAGS+= -lz
+LIBS+= -lz
-all: submake pg_dump$(X) pg_restore$(X)
+all: submake pg_dump pg_restore pg_dumpall
-pg_dump$(X): pg_dump.o common.o $(OBJS) $(LIBPQDIR)/libpq.a
+pg_dump: pg_dump.o common.o $(OBJS) $(LIBPQDIR)/libpq.a
$(CC) $(CFLAGS) -o $@ pg_dump.o common.o $(OBJS) $(LIBPQ) $(LDFLAGS)
-pg_restore$(X): pg_restore.o $(OBJS) $(LIBPQDIR)/libpq.a
+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
@@ -43,13 +49,13 @@ installdirs:
$(mkinstalldirs) $(bindir)
uninstall:
- rm -f $(addprefix $(bindir)/, pg_dump$(X) pg_dumpall pg_upgrade)
+ 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
+ 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
--
GitLab