Skip to content

Commit b5e2daf

Browse files
committed
Fix broken pg_dump makefile
1 parent d819f5f commit b5e2daf

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

src/bin/pg_dump/Makefile

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.18 2000/07/04 14:25:26 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.19 2000/07/04 19:52:00 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -16,19 +16,25 @@ OBJS= pg_backup_archiver.o pg_backup_custom.o pg_backup_files.o \
1616
pg_backup_plain_text.o $(STRDUP)
1717

1818
CFLAGS+= -I$(LIBPQDIR)
19-
LDFLAGS+= -lz
19+
LIBS+= -lz
2020

21-
all: submake pg_dump$(X) pg_restore$(X)
21+
all: submake pg_dump pg_restore pg_dumpall
2222

23-
pg_dump$(X): pg_dump.o common.o $(OBJS) $(LIBPQDIR)/libpq.a
23+
pg_dump: pg_dump.o common.o $(OBJS) $(LIBPQDIR)/libpq.a
2424
$(CC) $(CFLAGS) -o $@ pg_dump.o common.o $(OBJS) $(LIBPQ) $(LDFLAGS)
2525

26-
pg_restore$(X): pg_restore.o $(OBJS) $(LIBPQDIR)/libpq.a
26+
pg_restore: pg_restore.o $(OBJS) $(LIBPQDIR)/libpq.a
2727
$(CC) $(CFLAGS) -o $@ pg_restore.o $(OBJS) $(LIBPQ) $(LDFLAGS)
2828

2929
../../utils/strdup.o:
3030
$(MAKE) -C ../../utils strdup.o
3131

32+
pg_dumpall: pg_dumpall.sh
33+
sed -e 's:__VERSION__:$(VERSION):g' \
34+
-e 's:__MULTIBYTE__:$(MULTIBYTE):g' \
35+
-e 's:__bindir__:$(bindir):g' \
36+
< $< > $@
37+
3238
.PHONY: submake
3339
submake:
3440
$(MAKE) -C $(LIBPQDIR) all
@@ -43,13 +49,13 @@ installdirs:
4349
$(mkinstalldirs) $(bindir)
4450

4551
uninstall:
46-
rm -f $(addprefix $(bindir)/, pg_dump$(X) pg_dumpall pg_upgrade)
52+
rm -f $(addprefix $(bindir)/, pg_dump$(X) pg_restore$(X) pg_dumpall pg_upgrade)
4753

4854
depend dep:
4955
$(CC) -MM $(CFLAGS) *.c >depend
5056

5157
clean distclean maintainer-clean:
52-
rm -f pg_dump$(X) pg_restore$(X) $(OBJS) pg_dump.o common.o pg_restore.o
58+
rm -f pg_dump$(X) pg_restore$(X) $(OBJS) pg_dump.o common.o pg_restore.o pg_dumpall
5359

5460
ifeq (depend,$(wildcard depend))
5561
include depend

0 commit comments

Comments
 (0)