Moved configure script from src/ to the top level directory. Moved
authorPeter Eisentraut
Tue, 6 Jun 2000 22:01:15 +0000 (22:01 +0000)
committerPeter Eisentraut
Tue, 6 Jun 2000 22:01:15 +0000 (22:01 +0000)
configuration helper things into config/ dir. Adjusted some relative paths
in makefiles.

16 files changed:
GNUmakefile.in [new file with mode: 0644]
config/config.guess [moved from src/config.guess with 100% similarity]
config/config.sub [moved from src/config.sub with 100% similarity]
config/install-sh [moved from src/install-sh with 100% similarity]
config/mkinstalldirs [moved from src/mkinstalldirs with 100% similarity]
configure [moved from src/configure with 90% similarity]
configure.in [moved from src/configure.in with 95% similarity]
src/GNUmakefile.in
src/interfaces/ecpg/lib/Makefile.in
src/interfaces/libpgeasy/Makefile.in
src/interfaces/libpgtcl/Makefile.in
src/interfaces/libpq++/Makefile.in
src/interfaces/libpq/Makefile.in
src/interfaces/odbc/GNUmakefile.in
src/pl/plpgsql/src/Makefile.in
src/tools/release_prep

diff --git a/GNUmakefile.in b/GNUmakefile.in
new file mode 100644 (file)
index 0000000..f54997d
--- /dev/null
@@ -0,0 +1,30 @@
+#
+# PostgreSQL top level makefile
+#
+# $Header: /cvsroot/pgsql/GNUmakefile.in,v 1.1 2000/06/06 22:00:45 petere Exp $
+#
+
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+top_srcdir = @top_srcdir@
+top_builddir = .
+
+
+all:
+   make -C src all
+   @echo "All of PostgreSQL successfully made. Ready to install."
+
+install:
+   make -C src install
+   @cat $(srcdir)/register.txt
+
+clean:
+   make -C src clean
+
+distclean:
+   make -C src distclean
+   -rm -f config.cache config.log config.status GNUmakefile
+
+
+.PHONY: all install clean distclean
similarity index 100%
rename from src/config.guess
rename to config/config.guess
similarity index 100%
rename from src/config.sub
rename to config/config.sub
similarity index 100%
rename from src/install-sh
rename to config/install-sh
similarity index 100%
rename from src/mkinstalldirs
rename to config/mkinstalldirs
similarity index 90%
rename from src/configure
rename to configure
index ddc7a0733fc75a38762933b36752b55d85dbac63..0bf27d2e02e55469564fffe1d3323bef66600953 100755 (executable)
+++ b/configure
@@ -497,7 +497,7 @@ echo > confdefs.h
 
 # A filename unique to this package, relative to the directory that
 # configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=backend/access/common/heaptuple.c
+ac_unique_file=src/backend/access/common/heaptuple.c
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
@@ -570,8 +570,9 @@ fi
 
 
 
+
 ac_aux_dir=
-for ac_dir in `pwd` $srcdir/`pwd`; do
+for ac_dir in config $srcdir/config; do
   if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -583,7 +584,7 @@ for ac_dir in `pwd` $srcdir/`pwd`; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in `pwd` $srcdir/`pwd`" 1>&2; exit 1; }
+  { echo "configure: error: can not find install-sh or install.sh in config $srcdir/config" 1>&2; exit 1; }
 fi
 ac_config_guess=$ac_aux_dir/config.guess
 ac_config_sub=$ac_aux_dir/config.sub
@@ -597,7 +598,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:601: checking host system type" >&5
+echo "configure:602: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -691,7 +692,7 @@ fi
 
 
 echo $ac_n "checking setting template to""... $ac_c" 1>&6
-echo "configure:695: checking setting template to" >&5
+echo "configure:696: checking setting template to" >&5
 # Check whether --with-template or --without-template was given.
 if test "${with_template+set}" = set; then
   withval="$with_template"
@@ -703,7 +704,7 @@ else
 host="`echo $host | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`"
 
 # First, try for a template exactly matching $host
-if test -f "template/$host"
+if test -f "src/template/$host"
 then TEMPLATE="$host"
 else
     # Scan template/.similar for a rule that tells us which template to use.
@@ -726,7 +727,7 @@ else
    then
        echo "$LINE" | sed 's/^.*=//' > $TMPFILE
    fi
-    done