From 986e31bba78696fbbbe330a228cffc861da19f46 Mon Sep 17 00:00:00 2001 From: skywalker Date: Mon, 18 Nov 2002 02:57:39 +0000 Subject: [PATCH] Remove firebird_super target from makefile, when super is chosen firebird target will be the super edition. Configure.in changed to build some install files from new locations. --- Makefile.in | 2 +- configure.in | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index e167e327b0..4f898cdbc4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,5 +2,5 @@ all: firebird -firebird firebird_super install package packages dist clean clobber: +firebird install package packages dist clean clobber: $(MAKE) -C src $@ diff --git a/configure.in b/configure.in index 2942d5f77a..d35c793b30 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.90 2002-11-16 02:17:13 skywalker Exp $ +dnl $Id: configure.in,v 1.91 2002-11-18 02:57:39 skywalker Exp $ dnl ############################# INITIALISATION ############################### @@ -589,6 +589,7 @@ dnl EKU: handle platform specific installation and packaging case $PLATFORM in LINUX) mkdir -p gen/install/scripts + mkdir -p gen/install/misc INSTALL_SRC_DIR=src/install/arch-specific/linux/${FIREBIRD_ARCH_TYPE} AC_CONFIG_FILES([ gen/install/makeInstallImage.sh:${INSTALL_SRC_DIR}/makeInstallImage.sh.in @@ -602,11 +603,15 @@ case $PLATFORM in gen/install/scripts/postuninstall.sh:${INSTALL_SRC_DIR}/postuninstall.sh.in gen/install/scripts/rpmheader.txt:${INSTALL_SRC_DIR}/rpmheader.txt.in gen/install/scripts/rpmfiles.txt:${INSTALL_SRC_DIR}/rpmfiles.txt.in + gen/install/misc/firebird.xinetd:src/install/arch-specific/linux/misc/firebird.xinetd.in + gen/install/misc/changeDBAPassword.sh:src/install/arch-specific/linux/misc/changeDBAPassword.sh.in ],[ chmod a+x gen/install/scripts/*.sh gen/install/*sh 2>/dev/null ]) ;; + + SINIX-Z) AC_CONFIG_FILES([ gen/install/pkginfo:src/install/arch-specific/sinixz/pkginfo.in