diff --git a/contrib/pg_controldata/Makefile b/contrib/pg_controldata/Makefile
index f9ffe40080c58c319c9af1d4e8fc4d2730e34dd3..1d2b445007cccc669e16f3317340540332056a40 100644
--- a/contrib/pg_controldata/Makefile
+++ b/contrib/pg_controldata/Makefile
@@ -1,19 +1,23 @@
 #
-# $Header: /cvsroot/pgsql/contrib/pg_controldata/Attic/Makefile,v 1.3 2001/03/13 01:17:40 tgl Exp $
+# $Header: /cvsroot/pgsql/contrib/pg_controldata/Attic/Makefile,v 1.4 2001/04/03 19:06:19 tgl Exp $
 #
 
 subdir = contrib/pg_controldata
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS	= pg_controldata.o pg_crc.o
+OBJS	= pg_controldata.o pg_crc.o $(SNPRINTF)
 
 all: pg_controldata
 
 pg_controldata: $(OBJS)
 	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
 
-pg_crc.c: $(top_builddir)/src/backend/utils/hash/pg_crc.c
+pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
+	rm -f $@ && $(LN_S) $< .
+
+# this only gets done if configure finds system doesn't have snprintf()
+snprintf.c: $(top_srcdir)/src/backend/port/snprintf.c
 	rm -f $@ && $(LN_S) $< .
 
 install: all installdirs
@@ -27,7 +31,7 @@ uninstall:
 	rm -f $(bindir)/pg_controldata$(X) $(docdir)/contrib/README.pg_controldata
 
 clean distclean maintainer-clean:
-	rm -f pg_controldata$(X) $(OBJS) pg_crc.c
+	rm -f pg_controldata$(X) $(OBJS) pg_crc.c snprintf.c
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend
diff --git a/contrib/pg_resetxlog/Makefile b/contrib/pg_resetxlog/Makefile
index 2169d7a81e17c821fe34d826b5f659d2de84f207..eb4f536ff2baa32d555d206e5935898b2d579671 100644
--- a/contrib/pg_resetxlog/Makefile
+++ b/contrib/pg_resetxlog/Makefile
@@ -1,19 +1,23 @@
 #
-# $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/Makefile,v 1.1 2001/03/14 00:57:43 tgl Exp $
+# $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/Makefile,v 1.2 2001/04/03 19:01:57 tgl Exp $
 #
 
 subdir = contrib/pg_resetxlog
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS	= pg_resetxlog.o pg_crc.o
+OBJS	= pg_resetxlog.o pg_crc.o $(SNPRINTF)
 
 all: pg_resetxlog
 
 pg_resetxlog: $(OBJS)
 	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
 
-pg_crc.c: $(top_builddir)/src/backend/utils/hash/pg_crc.c
+pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
+	rm -f $@ && $(LN_S) $< .
+
+# this only gets done if configure finds system doesn't have snprintf()
+snprintf.c: $(top_srcdir)/src/backend/port/snprintf.c
 	rm -f $@ && $(LN_S) $< .
 
 install: all installdirs
@@ -27,7 +31,7 @@ uninstall:
 	rm -f $(bindir)/pg_resetxlog$(X) $(docdir)/contrib/README.pg_resetxlog
 
 clean distclean maintainer-clean:
-	rm -f pg_resetxlog$(X) $(OBJS) pg_crc.c
+	rm -f pg_resetxlog$(X) $(OBJS) pg_crc.c snprintf.c
 
 depend dep:
 	$(CC) -MM -MG $(CFLAGS) *.c > depend