Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16698
Modified Files:
Tag: rel-1-2-patches
ipset
Log Message:
- added condition for the base repository of p-o-m
Index: ipset
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ipset,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- ipset 17 Feb 2006 07:47:52 -0000 1.1.2.1
+++ ipset 27 Feb 2006 07:58:32 -0000 1.1.2.2
@@ -26,26 +26,34 @@
case $1 in
build )
- FLAGS="-O2"
- if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
- FLAGS="-O2 -fno-stack-protector"
- fi
+ if [ "$CONFIG_NF_PATCHES" = "y" ]; then
+ [ "$CONFIG_NF_BASE" = "y" ]; then
+ FLAGS="-O2"
+ if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
+ FLAGS="-O2 -fno-stack-protector"
+ fi
- replace_str Makefile "/usr/local" "/usr"
- # parallel build failes, do not use $PMAKE
- make all COPT_FLAGS="$FLAGS" KERNEL_DIR=$KERNELDIR || exit 1
- strip_debug
- # install it, so other programs can use it
- make install || exit 1
+ replace_str Makefile "/usr/local" "/usr"
+ # parallel build failes, do not use $PMAKE
+ make all COPT_FLAGS="$FLAGS" KERNEL_DIR=$KERNELDIR || exit 1
+ strip_debug
+ # install it, so other programs can use it
+ make install || exit 1
+ fi
+ fi
;;
install )
- rm -rf $TMPDIR || exit 1
- mkdir -p $TMPDIR || exit 1
- make install DESTDIR=$TMPDIR || exit 1
- copy_docs $TMPDIR
- copy_files $TMPDIR/usr $CDDIR || exit 1
- rm -rf $TMPDIR || exit 1
+ if [ "$CONFIG_NF_PATCHES" = "y" ]; then
+ [ "$CONFIG_NF_BASE" = "y" ]; then
+ rm -rf $TMPDIR || exit 1
+ mkdir -p $TMPDIR || exit 1
+ make install DESTDIR=$TMPDIR || exit 1
+ copy_docs $TMPDIR
+ copy_files $TMPDIR/usr $CDDIR || exit 1
+ rm -rf $TMPDIR || exit 1
+ fi
+ fi
;;
* )
|
