Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0dec669

Browse files
committed
Change $< to $+ in scripts Makefile, and clean up pg_encoding if logic.
1 parent7cf0f63 commit0dec669

File tree

7 files changed

+19
-16
lines changed

7 files changed

+19
-16
lines changed

‎src/bin/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.20 1999/12/05 20:02:43 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.21 1999/12/08 10:29:36 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ..
1515
include ../Makefile.global
1616

17-
DIRS = pg_id pg_version psql pg_dump pg_passwdcleardbdir\
17+
DIRS = pg_id pg_version psql pg_dump pg_passwd\
1818
scripts initdb initlocation ipcclean
1919

2020
ifdefMULTIBYTE

‎src/bin/initdb/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.13 1999/05/20 16:50:05 wieck Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.14 1999/12/08 10:29:39 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -21,7 +21,7 @@ initdb: initdb.sh
2121
initdb.sh> initdb
2222

2323
install: initdb
24-
$(INSTALL)$(INSTL_EXE_OPTS)$<$(BINDIR)/$<
24+
$(INSTALL)$(INSTL_EXE_OPTS)$+$(BINDIR)
2525

2626
clean:
2727
rm -f initdb

‎src/bin/initlocation/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.7 1999/06/04 21:12:06 tgl Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.8 1999/12/08 10:29:43 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -20,7 +20,7 @@ initlocation: initlocation.sh
2020
cp -p initlocation.sh initlocation
2121

2222
install: initlocation
23-
$(INSTALL)$(INSTL_EXE_OPTS)$<$(BINDIR)/$<
23+
$(INSTALL)$(INSTL_EXE_OPTS)$+$(BINDIR)
2424

2525
clean:
2626
rm -f initlocation

‎src/bin/ipcclean/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.8 1998/08/22 05:19:29 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.9 1999/12/08 10:29:46 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -23,7 +23,7 @@ ipcclean:
2323
sed$(SEDSCRIPT)<ipcclean.sh>ipcclean
2424

2525
install: ipcclean
26-
$(INSTALL)$(INSTL_EXE_OPTS)$<$(BINDIR)/$<
26+
$(INSTALL)$(INSTL_EXE_OPTS)$+$(BINDIR)
2727

2828
clean:
2929
rm -f ipcclean

‎src/bin/pg_ctl/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.1 1999/12/06 07:23:41 ishii Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.2 1999/12/08 10:29:51 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -20,7 +20,7 @@ pg_ctl: pg_ctl.sh
2020
sed -e's@__BINDIR__@$(BINDIR)@' pg_ctl.sh> pg_ctl
2121

2222
install: pg_ctl
23-
$(INSTALL)$(INSTL_EXE_OPTS)$<$(BINDIR)/$<
23+
$(INSTALL)$(INSTL_EXE_OPTS)$+$(BINDIR)
2424

2525
clean:
2626
rm -f pg_ctl

‎src/bin/scripts/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.2 1999/12/05 20:02:48 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.3 1999/12/08 10:29:55 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -32,7 +32,7 @@ droplang:
3232
vacuumdb:
3333

3434
install:$(SCRIPTS)
35-
$(INSTALL)$(INSTL_EXE_OPTS)$<$(BINDIR)/$(X)$<
35+
$(INSTALL)$(INSTL_EXE_OPTS)$+$(BINDIR)
3636

3737
clean:
3838
rm -f createlang

‎src/bin/scripts/createdb‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212
#
1313
# IDENTIFICATION
14-
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.2 1999/12/07 22:41:44 momjian Exp $
14+
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.3 1999/12/08 10:29:55 momjian Exp $
1515
#
1616
#-------------------------------------------------------------------------
1717

@@ -112,9 +112,12 @@ if [ "$usage" ]; then
112112
fi
113113

114114

115-
if ["$MB"-a-z"`pg_encoding'$MB'`" ];then
116-
echo"$CMDNAME:\"$MB\" is not a valid encoding name."
117-
exit 1
115+
if ["$MB" ]
116+
thenif [-z"`pg_encoding'$MB'`" ]
117+
then
118+
echo"$CMDNAME:\"$MB\" is not a valid encoding name."
119+
exit 1
120+
fi
118121
fi
119122

120123
if [-z"$dbname" ];then

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp