Change $< to $+ in scripts Makefile, and clean up pg_encoding if logic.

diff --git a/src/bin/Makefile b/src/bin/Makefile
index 46f942017b234af99cae75949da56dbd632e75d8..e16654a0505a231a0eeeffb14bdb9c1f3bb50514 100644 (file)
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -7,14 +7,14 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.20 1999/12/05 20:02:43 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.21 1999/12/08 10:29:36 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ..
 include ../Makefile.global
 
-DIRS = pg_id pg_version psql pg_dump pg_passwd cleardbdir \
+DIRS = pg_id pg_version psql pg_dump pg_passwd \
        scripts initdb initlocation ipcclean
 
 ifdef MULTIBYTE

diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index facc454d88f600793787f1174c0d26035d2df17d..992711fd83a8c261c39b1b30d6a097fb8760c44a 100644 (file)
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.13 1999/05/20 16:50:05 wieck Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.14 1999/12/08 10:29:39 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -21,7 +21,7 @@ initdb: initdb.sh
                        initdb.sh > initdb
 
 install: initdb
-       $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
+       $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
 
 clean:
        rm -f initdb

diff --git a/src/bin/initlocation/Makefile b/src/bin/initlocation/Makefile
index de55678d7d695042e4b42e4060a50dae8c376ce9..410bba1c64e3c997f95a10a37b57108cd2df3bf8 100644 (file)
--- a/src/bin/initlocation/Makefile
+++ b/src/bin/initlocation/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.7 1999/06/04 21:12:06 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.8 1999/12/08 10:29:43 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@ initlocation: initlocation.sh
        cp -p initlocation.sh initlocation
 
 install: initlocation
-       $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
+       $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
 
 clean:
        rm -f initlocation

diff --git a/src/bin/ipcclean/Makefile b/src/bin/ipcclean/Makefile
index a7521fb3319673c42f026bdb9928fe35b40f1bf4..970c94d25a2c8cc62a7d9f347c97fa350052d014 100644 (file)
--- a/src/bin/ipcclean/Makefile
+++ b/src/bin/ipcclean/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.8 1998/08/22 05:19:29 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.9 1999/12/08 10:29:46 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -23,7 +23,7 @@ ipcclean:
        sed $(SEDSCRIPT) <ipcclean.sh >ipcclean
 
 install: ipcclean
-       $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
+       $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
 
 clean:
        rm -f ipcclean

diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile
index 208f42f33b5c7855180afa23b5a882caad305572..ae432de3291ee31ceb29af9d169fb15b8ef0cdce 100644 (file)
--- a/src/bin/pg_ctl/Makefile
+++ b/src/bin/pg_ctl/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.1 1999/12/06 07:23:41 ishii Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.2 1999/12/08 10:29:51 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@ pg_ctl: pg_ctl.sh
        sed -e 's@__BINDIR__@$(BINDIR)@' pg_ctl.sh > pg_ctl
 
 install: pg_ctl
-       $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
+       $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
 
 clean:
        rm -f pg_ctl

diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile
index 155776e5a575e6f9379298f73657f6def5d9190a..5251d639eaedb03c857fb1e922c16d6f56b0e523 100644 (file)
--- a/src/bin/scripts/Makefile
+++ b/src/bin/scripts/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.2 1999/12/05 20:02:48 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.3 1999/12/08 10:29:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -32,7 +32,7 @@ droplang:
 vacuumdb:
 
 install: $(SCRIPTS)
-       $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$(X)$<
+       $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
 
 clean:
        rm -f createlang

diff --git a/src/bin/scripts/createdb b/src/bin/scripts/createdb
index bed7c3bec7d405a7c223e166073c84fa61cc1e70..800d560cc0331149fbaf4f645c718ec4cf3312f6 100644 (file)
--- a/src/bin/scripts/createdb
+++ b/src/bin/scripts/createdb
@@ -11,7 +11,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.2 1999/12/07 22:41:44 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.3 1999/12/08 10:29:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -112,9 +112,12 @@ if [ "$usage" ]; then
 fi
 
 
-if [ "$MB" -a -z "`pg_encoding '$MB'`" ]; then
-       echo "$CMDNAME: \"$MB\" is not a valid encoding name."
-       exit 1
+if [ "$MB" ]
+then   if [ -z "`pg_encoding '$MB'`" ]
+       then
+               echo "$CMDNAME: \"$MB\" is not a valid encoding name."
+               exit 1
+       fi
 fi
 
 if [ -z "$dbname" ]; then