Commita67343d

committed

Substitute libdir into createlang as last resort so one doesn't have to set

PGLIB or use any option anymore.

1 parent9b3d66e commita67343dCopy full SHA for a67343d

File tree

-10

lines changed

-10

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.6 2000/06/28 05:09:37 tgl Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.7 2000/08/20 11:56:29 petere Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -17,10 +17,12 @@ SCRIPTS := createdb dropdb createuser dropuser createlang droplang vacuumdb`
`17`	`17`	`all:$(SCRIPTS)`
`18`	`18`
`19`	`19`	`createlang: createlang.sh`
`20`		`-sed -e's/__DLSUFFIX__/$(DLSUFFIX)/'$<>$@`
	`20`	`+sed -e's:__DLSUFFIX__:$(DLSUFFIX):g'\`
	`21`	`+ -e's:__libdir__:$(libdir):g'\`
	`22`	`+$<>$@`
`21`	`23`
`22`	`24`	`install: all installdirs`
`23`		`-foriin$(SCRIPTS);do$(INSTALL_SCRIPT)$$i$(bindir);done`
	`25`	`+foriin$(SCRIPTS);do$(INSTALL_SCRIPT)$$i$(bindir)\|\|exit;done`
`24`	`26`
`25`	`27`	`installdirs:`
`26`	`28`	`$(mkinstalldirs)$(bindir)`

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#`
`9`	`9`	`#`
`10`	`10`	`# IDENTIFICATION`
`11`		`-# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.13 2000/07/19 11:53:02 wieck Exp $`
	`11`	`+# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.14 2000/08/20 11:56:29 petere Exp $`
`12`	`12`	`#`
`13`	`13`	`#-------------------------------------------------------------------------`
`14`	`14`
`@@ -129,7 +129,7 @@ if [ "$usage" ]; then`
`129`	`129`	`echo" -U, --username=USERNAME Username to connect as"`
`130`	`130`	`echo" -W, --password Prompt for password"`
`131`	`131`	`echo" -d, --dbname=DBNAME Database to install language in"`
`132`		`-echo" -L, --pglib=PGLIBFind language interpreter indirectory PGLIB"`
	`132`	`+echo" -L, --pglib=DIRECTORY Find language interpreterfileinDIRECTORY"`
`133`	`133`	`echo" -l, --list Show a list of currently installed languages"`
`134`	`134`	`echo`
`135`	`135`	`echo"Report bugs to <pgsql-bugs@postgresql.org>."`
`@@ -160,11 +160,7 @@ fi`
`160`	`160`	`# Check that we have PGLIB`
`161`	`161`	`# ----------`
`162`	`162`	`if [-z"$PGLIB" ];then`
`163`		`-echo"$CMDNAME: missing required argument PGLIB directory"`
`164`		`-echo"(This is the directory where the interpreter for the procedural"`
`165`		`-echo"language is stored. Traditionally, these are installed in whatever"`
`166`		`-echo"'lib' directory was specified at configure time.)"`
`167`		`-exit 1`
	`163`	`+PGLIB='__libdir__'`
`168`	`164`	`fi`
`169`	`165`
`170`	`166`	`# ----------`

Comments

(0)