opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Bruce Momjian 1999-12-08 10:29:55 +00:00
parent 7cf0f634d5
commit 0dec669a0f
7 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/Makefile
View File

@ -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

4
src/bin/initdb/Makefile
View File

@ -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

4
src/bin/initlocation/Makefile
View File

@ -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

4
src/bin/ipcclean/Makefile
View File

@ -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

4
src/bin/pg_ctl/Makefile
View File

@ -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

4
src/bin/scripts/Makefile
View File

@ -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

11
src/bin/scripts/createdb
View File

@ -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