Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5177/scripts
Modified Files:
Tag: rel-1-2-patches
dhcp motion
Log Message:
- corrected motion compile (Heiko / Martin Wilderoth)
- corrected dhcp compile (Heiko / Martin Wilderoth)
Index: motion
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/motion,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- motion 21 Feb 2008 20:34:37 -0000 1.1.2.2
+++ motion 28 Feb 2008 16:36:30 -0000 1.1.2.3
@@ -38,8 +38,8 @@
else
OPT_FLAGS="$OPT_FLAGS --with-pgsql=/usr/include"
fi
- /bin/sh configure --prefix=$TMPDIR/usr --bindir=$TMPDIR/usr/sbin \
- --sysconfdir=$TMPDIR/etc --mandir=$TMPDIR/usr/share/man $OPT_FLAGS || exit 1
+ /bin/sh configure --prefix=/usr --bindir=/usr/sbin \
+ --sysconfdir=/etc --mandir=/usr/share/man $OPT_FLAGS || exit 1
make $PMAKE all || exit 1
strip_debug
fi
@@ -48,7 +48,7 @@
install )
if [ "$CONFIG_MOTION" = "y" ]; then
rm -rf $TMPDIR || exit 1
- make install || exit 1
+ make install DESTDIR=$TMPDIR || exit 1
copy_docs $TMPDIR || exit 1
copy_man $TMPDIR || exit 1
Index: dhcp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dhcp,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -d -r1.21.2.1 -r1.21.2.2
--- dhcp 21 Feb 2008 20:34:37 -0000 1.21.2.1
+++ dhcp 28 Feb 2008 16:36:30 -0000 1.21.2.2
@@ -28,18 +28,24 @@
case $1 in
build )
if [ "$CONFIG_ISC_DHCP" = "y" ]; then
+ if [ ! -f .dl_patch_done ]; then
+ bzcat $DL_DIR/src/dhcp-3.0.1-fix_gcc_3.4.3_compile_error-1.patch.bz2 | patch -p1 || exit 1
+ touch .dl_patch_done
+ fi
# correct pathnames
cat > site.conf <<-EOF
- USERBINDIR = $TMPDIR/usr/bin
- BINDIR = $TMPDIR/usr/sbin
- CLIENTBINDIR=$TMPDIR/sbin
- ADMMANDIR = $TMPDIR/usr/share/man/man8
- FFMANDIR = $TMPDIR/usr/share/man/man5
- LIBMANDIR = $TMPDIR/usr/share/man/man3
- USRMANDIR = $TMPDIR/usr/share/man/man1
- LIBDIR=$TMPDIR/usr/local/lib
- INCDIR=$TMPDIR/usr/local/include
+ USERBINDIR = /usr/bin
+ BINDIR = /usr/sbin
+ CLIENTBINDIR = /sbin
+ ADMMANDIR = /usr/share/man/man8
+ FFMANDIR = /usr/share/man/man5
+ LIBMANDIR = /usr/share/man/man3
+ USRMANDIR = /usr/share/man/man1
+ LIBDIR=/usr/local/lib
+ INCDIR=/usr/local/include
EOF
+
+ echo $TMPDIR > DL.TMPDIR
./configure || exit 1
make $PMAKE all || exit 1
@@ -49,9 +55,10 @@
install )
if [ "$CONFIG_ISC_DHCP" = "y" ]; then
+ TMPDIR=$(cat DL.TMPDIR)
rm -rf $TMPDIR || exit 1
mkdir -p $TMPDIR/sbin || exit 1
- make install || exit 1
+ make install DESTDIR=$TMPDIR || exit 1
copy_docs $TMPDIR
rm -rf $TMPDIR/usr/local || exit 1
rm -rf $TMPDIR/usr/share || exit 1
|
