Sambactrl und samba.cgi von Maniacikarus

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

diff --git a/make.sh b/make.sh
index 63ffa6edb9158032d96f6cb88763670495ecad75..632f6ecf979a89ad60ff31a5e7421efd5d491f59 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -33,7 +33,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 SVN_REVISION=`svn info | grep Revision | cut -c 11-`
 
-IPFVER="full devel"                            # Which versions should be compiled? (full|light|voice|devel)
+IPFVER="full"                          # Which versions should be compiled? (full|light|voice|devel)
 
 # Set an information about the build number
 if [ -e ./.svn ]; then
@@ -170,7 +170,7 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j12"
+    MAKETUNING="-j4"
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -345,6 +345,7 @@ buildipfire() {
 #  ipfiremake promise-sata-300-tx
   ipfiremake zaptel
   ipfiremake fuse
+  ipfiremake pkg-config
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
@@ -461,7 +462,6 @@ buildipfire() {
   ipfiremake spandsp
   ipfiremake lzo
   ipfiremake openvpn
-  ipfiremake pkg-config
   ipfiremake glib
   ipfiremake pammysql
   ipfiremake xinetd
@@ -582,7 +582,7 @@ buildpackages() {
   for i in $IPFVER
   do
        if [ $i == "devel" ]; then
-               if [ ! -f ipfire-$VER.i586-devel.iso ]; then
+               if [ ! -e ipfire-$VERSION.i586-devel.iso ]; then
                        ipfiremake cdrom ED=$i
                fi
        else
@@ -992,7 +992,7 @@ EOF
        esac
        ;;
 batch)
-       if [ "$2" -eq "--background" ]; then
+       if [ "$2" = "--background" ]; then
                batch_script
                exit $?
        fi