diff options
Diffstat (limited to 'src/bin/scripts')
| -rw-r--r-- | src/bin/scripts/Makefile | 4 | ||||
| -rw-r--r-- | src/bin/scripts/createdb | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index 155776e5a57..5251d639eae 100644 --- 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 bed7c3bec7d..800d560cc03 100644 --- 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 |