rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make createlang use dynamic loader enhancements (automatic path and suffix).

This commit is contained in:
Peter Eisentraut 2001-05-23 22:00:43 +00:00
parent 0995a5103f
commit 623453a807
2 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/scripts/Makefile
View File

@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.12 2001/02/18 18:34:01 momjian Exp $
# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.13 2001/05/23 22:00:43 petere Exp $
#
#-------------------------------------------------------------------------
@ -18,9 +18,7 @@ SCRIPTS := createdb dropdb createuser dropuser createlang droplang vacuumdb
all: $(SCRIPTS)
createlang: createlang.sh
sed -e 's/@DLSUFFIX@/$(DLSUFFIX)/g' \
-e 's,@libdir@,$(libdir),g' \
$< >$@
cp $< $@
chmod a+x $@
install: all installdirs

27
src/bin/scripts/createlang.sh
View File

@ -7,7 +7,7 @@
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California
#
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.25 2001/05/12 01:30:30 petere Exp $
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.26 2001/05/23 22:00:43 petere Exp $
#
#-------------------------------------------------------------------------
@ -170,7 +170,7 @@ fi
# Check that we have PGLIB
# ----------
if [ -z "$PGLIB" ]; then
PGLIB='@libdir@'
PGLIB='$libdir'
fi
# ----------
@ -222,27 +222,6 @@ case "$langname" in
;;
esac
DLSUFFIX='@DLSUFFIX@'
# ----------
# Check that the shared object for the call handler is installed
# in PGLIB
# ----------
if [ ! -f "$PGLIB/$object$DLSUFFIX" ]; then
(
echo "$CMDNAME: cannot find the file '$PGLIB/$langname$DLSUFFIX'"
echo ""
echo "This file contains the call handler for $lancomp. By default,"
echo "only PL/pgSQL is built and installed; other languages must be"
echo "explicitly enabled at configure time."
echo ""
echo "To install PL/Tcl, make sure the option --with-tcl is given to"
echo "configure, then recompile and install. To install PL/Perl use"
echo "--with-perl."
) 1>&2
exit 1
fi
PSQL="${PATHNAME}psql -A -t -q $PSQLOPT -d $dbname -c"
@ -280,7 +259,7 @@ fi
# ----------
# Create the call handler and the language
# ----------
sqlcmd="CREATE FUNCTION $handler () RETURNS OPAQUE AS '$PGLIB/${object}$DLSUFFIX' LANGUAGE 'C';"
sqlcmd="CREATE FUNCTION $handler () RETURNS OPAQUE AS '$PGLIB/${object}' LANGUAGE 'C';"
if [ "$showsql" = yes ]; then
echo "$sqlcmd"
fi