Fix broken Makefiles.

diff --git a/src/bin/Makefile b/src/bin/Makefile
index 1758d5f..ba82356 100644 (file)
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.36 2002/06/20 20:29:41 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.37 2002/08/17 04:03:35 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,7 +14,7 @@ top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
 DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
-       psql scripts pg_config
+       psql scripts pg_config pg_controldata pg_resetxlog
 
 ifdef MULTIBYTE
 DIRS += pg_encoding

diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile
index 1afc039..ec03532 100644 (file)
--- a/src/bin/pg_controldata/Makefile
+++ b/src/bin/pg_controldata/Makefile
@@ -2,9 +2,9 @@
 #
 # Makefile for src/bin/pg_controldata
 #
-# Copyright (c) 1998, PostgreSQL Global Development Group
+# Copyright (c) 1998-2002, PostgreSQL Global Development Group
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_controldata/Makefile,v 1.2 2002/08/17 02:43:08 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_controldata/Makefile,v 1.3 2002/08/17 04:03:35 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,14 +14,14 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS= pg_controldata.o pg_crc.o
 
-pg_crc.c: $(top_builddir)/src/backend/utils/hash/pg_crc.c
-       rm -f $@ && $(LN_S) $< .
-
 all: submake-libpgport pg_controldata
 
 pg_controldata: $(OBJS)
        $(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@
 
+pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
+       rm -f $@ && $(LN_S) $< .
+
 install: all installdirs
        $(INSTALL_PROGRAM) pg_controldata$(X) $(DESTDIR)$(bindir)/pg_controldata$(X)
 

diff --git a/src/bin/pg_resetxlog/Makefile b/src/bin/pg_resetxlog/Makefile
index 2eaddba..0a4164c 100644 (file)
--- a/src/bin/pg_resetxlog/Makefile
+++ b/src/bin/pg_resetxlog/Makefile
@@ -2,9 +2,9 @@
 #
 # Makefile for src/bin/pg_resetxlog
 #
-# Copyright (c) 1998, PostgreSQL Global Development Group
+# Copyright (c) 1998-2002, PostgreSQL Global Development Group
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/Makefile,v 1.1 2002/08/17 02:44:24 momjian Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/Makefile,v 1.2 2002/08/17 04:03:36 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,14 +14,14 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS= pg_resetxlog.o pg_crc.o
 
-pg_crc.c: $(top_builddir)/src/backend/utils/hash/pg_crc.c
-       rm -f $@ && $(LN_S) $< .
-
 all: submake-libpgport pg_resetxlog
 
 pg_resetxlog: $(OBJS)
        $(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@
 
+pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
+       rm -f $@ && $(LN_S) $< .
+
 install: all installdirs
        $(INSTALL_PROGRAM) pg_resetxlog$(X) $(DESTDIR)$(bindir)/pg_resetxlog$(X)