Korrekturen

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 5fe00355c7d83d5ef4b0f3d9d6bb4de3ffd580dd..91f976d561c2f5c16d36eb0d6c26c6b0f58051f0 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -33,6 +33,12 @@
   KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
   MACHINE=`uname -m`
 
+  # Setzen des IPFire Builds
+  if [ -e ./.svn ]; then
+    FIREBUILD=`cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p'`
+#    VERSION="$VERSION (Build:$FIREBUILD)"
+  fi
+
   # Debian specific settings
   if [ ! -e /etc/debian_version ]; then
        FULLPATH=`which $0`
@@ -673,6 +679,10 @@ buildipcop() {
   ipcopmake java
   ipcopmake libtiff
   ipcopmake libjpeg
+  ipcopmake lcms
+  ipcopmake libmng
+  ipcopmake freetype
+  ipcopmake bootsplash
   ipcopmake libxml2
   ipcopmake spandsp
   ipcopmake lzo
@@ -839,9 +849,11 @@ buildpackages() {
 }
 
 ipfirepackages() {
-  for i in `ls $BASEDIR/packages`; do
-       touch $BASEDIR/build/install/packages/$i.empty
-  done
+  if [ -d "$BASEDIR/packages" ]; then
+         for i in `ls $BASEDIR/packages`; do
+               touch $BASEDIR/build/install/packages/$i.empty
+         done
+  fi
   ipfiredist amavisd
   ipfiredist applejuice
   ipfiredist asterisk
@@ -900,10 +912,10 @@ build)
        buildipcop
 
        # Setzen des IPFire Builds
-       if [ -e ./.svn ]; then
-               cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p' > $LFS/home/httpd/html/firebuild
+       if [ "$FIREBUILD" ]; then
+               echo "$FIREBUILD" > $CONFIG_ROOT/firebuild
        else
-               echo "_(OvO)_" > $LFS/home/httpd/html/firebuild
+               echo "_(OvO)_" > $CONFIG_ROOT/firebuild
        fi
 
        buildinstaller