Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5586
Modified Files:
Tag: rel-1-2-patches
poptop
Log Message:
-- fixed plugin (pptpd-logwtmp.so) installation
Index: poptop
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/poptop,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- poptop 15 Jan 2006 11:40:13 -0000 1.5.2.2
+++ poptop 16 May 2007 12:13:53 -0000 1.5.2.3
@@ -39,18 +39,19 @@
install )
if [ "$CONFIG_PPP" = "y" ] && [ "$CONFIG_POPTOP" = "y" ]; then
- rm -rf $WORKDIR/tmp || exit 1
- mkdir -p $WORKDIR/tmp || exit 1
- make install DESTDIR=$WORKDIR/tmp || exit 1
- copy_docs $WORKDIR/tmp
+ replace_str ./plugins/Makefile '?= $(DESTDIR)$(prefix)/lib/pptpd' '= $(DESTDIR)$(prefix)/lib/pptpd'
+ rm -rf $TMPDIR || exit 1
+ mkdir -p $TMPDIR || exit 1
+ make install DESTDIR=$TMPDIR || exit 1
+ copy_docs $TMPDIR
mkdir -p $DOCDIR/pptpd || exit 1
#cp -dp ./html/* $DOCDIR/pptpd
- copy_files $WORKDIR/tmp/usr $CDDIR || exit 1
+ copy_files $TMPDIR/usr $CDDIR || exit 1
#replace_str ./samples/pptpd.conf "#option /etc/ppp/options.pptpd" "option /etc/ppp/options.pptp"
cp -p ./samples/pptpd.conf $ETCDIR/etc || exit 1
cp -p $MYDIR/scripts/options.pptp $ETCDIR/etc/ppp/options.pptpd || exit 1
cp $MYDIR/scripts/pptpd $ETCDIR/etc/init.d/
- rm -rf $WORKDIR/tmp || exit 1
+ rm -rf $TMPDIR || exit 1
echo "# Start $MYNAME?" >> $CONFIGFILE
echo "START_PPTPD=no" >> $CONFIGFILE
|
