r20 - in tools: devel/trunk scripts/trunk tools/trunk

[Dennis Gregorovic <dgregoro@xxxxxxxxxxxxxxxxxxxxxxxxx>]

Author: dgregoro
Date: 2004-09-10 18:43:36 +0200 (Fri, 10 Sep 2004)
New Revision: 20

Modified:
   tools/devel/trunk/build.sh
   tools/scripts/trunk/build.sh
   tools/tools/trunk/build.sh
Log:
fix up build.sh for the tools components so that it can be used to build and 
install them

Modified: tools/devel/trunk/build.sh
===================================================================
--- tools/devel/trunk/build.sh  2004-09-10 16:42:34 UTC (rev 19)
+++ tools/devel/trunk/build.sh  2004-09-10 16:43:36 UTC (rev 20)
@@ -1,35 +1,28 @@
 #!/bin/sh
 
-
-# Exit immediately if command fails
 set -e
+set -v
 
-# Print command executed to stdout
-#set -v
-
-make maintainer-clean || :
-
 # Intialise the build environment
 aclocal
 autoconf
 automake -a
 
-# Do a VPATH build so we don't mess up the source dir
-#builddir="obj"
-#mkdir $builddir || :
-#ln -s `pwd` $builddir/.install_link
-#cd $builddir
-
-# Configure & make a distribution - no need to 
-# actually compile at this stage since this is 
-# done by rpm later
-#.install_link/configure
-ID=`id -u`
-if [ $ID = 0 ]; then
-  ./configure --prefix=/usr/local
-else
-  ./configure --prefix=$HOME/usr
+if [ -n "$1" ]; then
+  PREFIX=$1
 fi
+if [ -z "$PREFIX"]; then
+  ID=`id -u`
+  if [ $ID = 0 ]; then
+    PREFIX=
+  else
+    PREFIX=$HOME
+  fi
+fi
+
+./configure --prefix=$PREFIX/usr --sysconfdir=$PREFIX/etc 
--localstatedir=$PREFIX/var
 make
+make install
 
 # End of file
+

Modified: tools/scripts/trunk/build.sh
===================================================================
--- tools/scripts/trunk/build.sh        2004-09-10 16:42:34 UTC (rev 19)
+++ tools/scripts/trunk/build.sh        2004-09-10 16:43:36 UTC (rev 20)
@@ -1,35 +1,28 @@
 #!/bin/sh
 
-
-# Exit immediately if command fails
 set -e
+set -v
 
-# Print command executed to stdout
-#set -v
-
-make maintainer-clean || :
-
 # Intialise the build environment
 aclocal
 autoconf
 automake -a
 
-# Do a VPATH build so we don't mess up the source dir
-#builddir="obj"
-#mkdir $builddir || :
-#ln -s `pwd` $builddir/.install_link
-#cd $builddir
-
-# Configure & make a distribution - no need to 
-# actually compile at this stage since this is 
-# done by rpm later
-#.install_link/configure
-ID=`id -u`
-if [ $ID = 0 ]; then
-  ./configure --prefix=/usr/local
-else
-  ./configure --prefix=$HOME/usr
+if [ -n "$1" ]; then
+  PREFIX=$1
 fi
+if [ -z "$PREFIX"]; then
+  ID=`id -u`
+  if [ $ID = 0 ]; then
+    PREFIX=
+  else
+    PREFIX=$HOME
+  fi
+fi
+
+./configure --prefix=$PREFIX/usr --sysconfdir=$PREFIX/etc 
--localstatedir=$PREFIX/var
 make
+make install
 
 # End of file
+

Modified: tools/tools/trunk/build.sh
===================================================================
--- tools/tools/trunk/build.sh  2004-09-10 16:42:34 UTC (rev 19)
+++ tools/tools/trunk/build.sh  2004-09-10 16:43:36 UTC (rev 20)
@@ -1,35 +1,28 @@
 #!/bin/sh
 
-
-# Exit immediately if command fails
 set -e
+set -v
 
-# Print command executed to stdout
-#set -v
-
-make maintainer-clean || :
-
 # Intialise the build environment
 aclocal
 autoconf
 automake -a
 
-# Do a VPATH build so we don't mess up the source dir
-#builddir="obj"
-#mkdir $builddir || :
-#ln -s `pwd` $builddir/.install_link
-#cd $builddir
-
-# Configure & make a distribution - no need to 
-# actually compile at this stage since this is 
-# done by rpm later
-#.install_link/configure
-ID=`id -u`
-if [ $ID = 0 ]; then
-  ./configure --prefix=/usr/local
-else
-  ./configure --prefix=$HOME/usr
+if [ -n "$1" ]; then
+  PREFIX=$1
 fi
+if [ -z "$PREFIX"]; then
+  ID=`id -u`
+  if [ $ID = 0 ]; then
+    PREFIX=
+  else
+    PREFIX=$HOME
+  fi
+fi
+
+./configure --prefix=$PREFIX/usr --sysconfdir=$PREFIX/etc 
--localstatedir=$PREFIX/var
 make
+make install
 
 # End of file
+