[Aplaws-commit] r200 - tools/trunk/tools

[<ap...@re...>]

Author: apevec
Date: 2005-02-05 00:24:20 +0100 (Sat, 05 Feb 2005)
New Revision: 200

Modified:
   tools/trunk/tools/build.sh
   tools/trunk/tools/make-zip.sh
Log:
merge changes from byline tip (r35)


Modified: tools/trunk/tools/build.sh
===================================================================
--- tools/trunk/tools/build.sh	2005-02-04 23:10:33 UTC (rev 199)
+++ tools/trunk/tools/build.sh	2005-02-04 23:24:20 UTC (rev 200)
@@ -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/trunk/tools/make-zip.sh
===================================================================
--- tools/trunk/tools/make-zip.sh	2005-02-04 23:10:33 UTC (rev 199)
+++ tools/trunk/tools/make-zip.sh	2005-02-04 23:24:20 UTC (rev 200)
@@ -136,12 +136,14 @@
   zip -r "$FILENAME" *
 )
 
-mv "$BUILD_HOME/$FILENAME" .
 
 if [ "x$X_CCM_DIST_ZIP_DIR" != "x" ]; then
-  cp "$FILENAME" "$X_CCM_DIST_ZIP_DIR"
+  mkdir -p "$X_CCM_DIST_ZIP_DIR"
+  mv "$BUILD_HOME/$FILENAME" "$X_CCM_DIST_ZIP_DIR"
+  echo "Wrote $X_CCM_DIST_ZIP_DIR/$FILENAME"
+else
+  mv "$BUILD_HOME/$FILENAME" .
+  echo "Wrote $FILENAME"
 fi
 
 rm -rf "$BUILD_HOME"
-
-echo "Wrote $FILENAME"