summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1998-10-16 17:00:44 +0000
committerBruce Momjian1998-10-16 17:00:44 +0000
commitaf8df21b7e23fa83f80a3ef16ceea6796894b5d6 (patch)
treeaa8bb9fbb4be90d811b01c777e60779e5e5cc505
parentf731abe635a0d4163b47904471ca449f0648c727 (diff)
Add missing tcl *.in files.
-rw-r--r--src/GNUmakefile.in10
-rw-r--r--src/bin/pgtclsh/mkMakefile.tcldefs.sh.in16
-rw-r--r--src/bin/pgtclsh/mkMakefile.tkdefs.sh.in18
-rw-r--r--src/interfaces/perl5/Makefile.PL40
4 files changed, 52 insertions, 32 deletions
diff --git a/src/GNUmakefile.in b/src/GNUmakefile.in
index 8ed9fb03c73..b4ae11c4fde 100644
--- a/src/GNUmakefile.in
+++ b/src/GNUmakefile.in
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.35 1998/10/12 05:07:53 momjian Exp $
+# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.36 1998/10/16 17:00:42 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -78,6 +78,14 @@ distclean: clean
bin/psql/Makefile \
bin/pgtclsh/mkMakefile.tcltkdefs.sh \
bin/pgtclsh/Makefile.tcltkdefs \
+
+? pgsql/src/bin/pgtclsh/mkMakefile.tcldefs.sh
+? pgsql/src/bin/pgtclsh/mkMakefile.tkdefs.sh.in
+? pgsql/src/bin/pgtclsh/mkMakefile.tcldefs.sh.in
+? pgsql/src/bin/pgtclsh/mkMakefile.tkdefs.sh
+? pgsql/src/bin/pgtclsh/Makefile.tkdefs
+? pgsql/src/bin/pgtclsh/Makefile.
+
bin/pg_dump/Makefile \
bin/pg_version/Makefile \
include/config.h \
diff --git a/src/bin/pgtclsh/mkMakefile.tcldefs.sh.in b/src/bin/pgtclsh/mkMakefile.tcldefs.sh.in
new file mode 100644
index 00000000000..a8c2cc374de
--- /dev/null
+++ b/src/bin/pgtclsh/mkMakefile.tcldefs.sh.in
@@ -0,0 +1,16 @@
+
+if [ ! -f @TCL_CONFIG_SH@ ]; then
+ echo "@TCL_CONFIG_SH@ not found"
+ echo "I need this file! Please make a symbolic link to this file"
+ echo "and start make again."
+ exit 1
+fi
+
+cat @TCL_CONFIG_SH@ |
+ egrep '^TCL_' |
+ while read inp
+ do
+ eval eval echo $inp
+ done >Makefile.tcldefs
+
+exit 0
diff --git a/src/bin/pgtclsh/mkMakefile.tkdefs.sh.in b/src/bin/pgtclsh/mkMakefile.tkdefs.sh.in
new file mode 100644
index 00000000000..3b5fd2402f4
--- /dev/null
+++ b/src/bin/pgtclsh/mkMakefile.tkdefs.sh.in
@@ -0,0 +1,18 @@
+
+if [ ! -f @TK_CONFIG_SH@ ]; then
+ echo "@TK_CONFIG_SH@ not found"
+ echo "I need this file! Please make a symbolic link to this file"
+ echo "and start make again."
+ exit 1
+fi
+
+. @TK_CONFIG_SH@
+
+cat @TK_CONFIG_SH@ |
+ egrep '^TK_' |
+ while read inp
+ do
+ eval eval echo $inp
+ done >Makefile.tkdefs
+
+exit 0
diff --git a/src/interfaces/perl5/Makefile.PL b/src/interfaces/perl5/Makefile.PL
index f85a1c15b6a..a53d77e939a 100644
--- a/src/interfaces/perl5/Makefile.PL
+++ b/src/interfaces/perl5/Makefile.PL
@@ -1,6 +1,7 @@
+# Generated automatically from Makefile.PL.in by configure.
#-------------------------------------------------------
#
-# $Id: Makefile.PL,v 1.10 1998/10/16 04:37:38 momjian Exp $
+# $Id: Makefile.PL,v 1.11 1998/10/16 17:00:44 momjian Exp $
#
# Copyright (c) 1997, 1998 Edmund Mergl
#
@@ -10,26 +11,6 @@ use ExtUtils::MakeMaker;
use Config;
use strict;
-# This Makefile.PL is intended for standalone use when PostgreSQL is
-# already installed. In that case, install the perl module as follows:
-#
-# setenv POSTGRES_HOME /path/to/root/of/installed/postgres
-# perl Makefile.PL
-# make
-# make test
-# make install
-
-# During normal installation of PostgreSQL, this file will be replaced
-# by one derived from Makefile.PL.in so that the installed shared
-# library libpq.so will be found during installation of this module.
-# As a result, the POSTGRES_HOME environment variable need not be set
-# during PostgreSQL installation. Note that ../Makefile takes care of
-# the `perl Makefile.PL' command. Note also that it is still possible
-# to follow the standalone installation procedure, even after
-# configuring and installing PostgreSQL, because the `else'
-# conditional branch below is identical in both Makefile.PL and
-# Makefile.PL.in.
-
my %opts;
if (! $ENV{POSTGRES_HOME}) {
@@ -37,17 +18,14 @@ if (! $ENV{POSTGRES_HOME}) {
my $cwd = `pwd`;
chop $cwd;
- print "To install the perl interface for PostgreSQL do the following:\n";
- print " - install PostgreSQL\n";
- print " - set the POSTGRES_HOME environment variable appropriately\n";
- print " - in this directory ($cwd):\n";
- print " perl Makefile.PL\n";
- print " make\n";
- print " make test [ with a postmaster running ]\n";
- print " make install\n";
+ %opts = (
+ NAME => 'Pg',
+ VERSION_FROM => 'Pg.pm',
+ INC => "-I$cwd/../libpq -I$cwd/../../include",
+ OBJECT => "Pg\$(OBJ_EXT)",
+ LIBS => ["-L/usr/local/pgsql/lib -L$cwd/../libpq -lpq"],
+ );
- exit(1);
-
} else {
%opts = (