Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5202/scripts
Modified Files:
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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- motion 13 Dec 2004 17:31:11 -0000 1.5
+++ motion 28 Feb 2008 16:36:52 -0000 1.6
@@ -38,19 +38,17 @@
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
- echo $TMPDIR > DL.TMPDIR
strip_debug
fi
;;
install )
if [ "$CONFIG_MOTION" = "y" ]; then
- TMPDIR=$(cat DL.TMPDIR)
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.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- dhcp 24 Dec 2004 17:03:50 -0000 1.24
+++ dhcp 28 Feb 2008 16:36:52 -0000 1.25
@@ -34,15 +34,15 @@
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
@@ -58,7 +58,7 @@
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
|
