#
#
# 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
#
#
# 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 $
#
#-------------------------------------------------------------------------
initdb.sh > initdb
install: initdb
- $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
+ $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
clean:
rm -f initdb
#
#
# 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 $
#
#-------------------------------------------------------------------------
cp -p initlocation.sh initlocation
install: initlocation
- $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
+ $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
clean:
rm -f initlocation
#
#
# 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 $
#
#-------------------------------------------------------------------------
sed $(SEDSCRIPT) <ipcclean.sh >ipcclean
install: ipcclean
- $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
+ $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
clean:
rm -f ipcclean
#
#
# 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 $
#
#-------------------------------------------------------------------------
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
#
#
# 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 $
#
#-------------------------------------------------------------------------
vacuumdb:
install: $(SCRIPTS)
- $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$(X)$<
+ $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
clean:
rm -f createlang
#
#
# 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 $
#
#-------------------------------------------------------------------------
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