i

Improvements to Makefiles to compensate for errors in compiling

From: bryanh@giraffe.netgate.net (Bryan Henderson)

diff --git a/src/bin/Makefile b/src/bin/Makefile
index f3ef4a87e50c60e00aee9237c5afee74bc5bed84..b8a5d0b0b7f3c7050ad4e98eb41d15b3c668334f 100644 (file)
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -7,29 +7,33 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.3 1996/07/25 06:54:26 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.3.2.1 1996/08/20 04:16:20 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 MKDIR=../mk
 -include $(MKDIR)/../Makefile.global
 
+.DEFAULT all:
 #
 # C programs
 #
-SUBDIR=  pg_id pg_version psql pg_dump
-
+       $(MAKE) -C pg_id $@
+       $(MAKE) -C pg_version $@
+       $(MAKE) -C psql $@
+       $(MAKE) -C pg_dump $@
 #
 # Shell scripts
 # 
-SUBDIR+= cleardbdir createdb createuser destroydb destroyuser initdb 
-
+       $(MAKE) -C cleardbdir $@
+       $(MAKE) -C createdb $@
+       $(MAKE) -C createuser $@
+       $(MAKE) -C destroydb $@
+       $(MAKE) -C destroyuser $@
+       $(MAKE) -C initdb $@
 #
 # TCL/TK programs
 #
 ifeq ($(USE_TCL), true)
-SUBDIR += pgtclsh
+       $(MAKE) -C pgtclsh $@
 endif
-
-include $(MKDIR)/postgres.subdir.mk
-