privoxy and tor fixes

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@191 370017ae-e619-0410-ac65-c121f96126d4

diff --git a/privoxy/privoxy.SlackBuild b/privoxy/privoxy.SlackBuild
index 61dc346ad0aeec3d0a3bf9ced46bbeba61819610..c5492821d5f144294fbec96ee3cdb7b56251a93e 100755 (executable)
--- a/privoxy/privoxy.SlackBuild
+++ b/privoxy/privoxy.SlackBuild
@@ -66,25 +66,26 @@ autoconf
 ./configure --prefix=/usr --sysconfdir=/etc/$PACKAGE --libdir=$LIBDIR
 make
 
-CWD="`pwd`"
-
 # for VERSION=0.3.3, privoxy Makefile doesnt respect DESTDIR correctly,
 # so beyond the patch we still need to do some nasty stuff...
 
 if [ "$VERSION" == "3.0.3" ]; then
   make DESTDIR=install install
+  mkdir -p install/etc/rc.d
+  cp $CWD/rc.privoxy.new install/etc/rc.d
+  CWD="`pwd`"
   cd install
 else
   make DESTDIR=$TMP/package-$PACKAGE install
+  mkdir -p $TMP/package-$PACKAGE/etc/rc.d
+  cp $CWD/rc.privoxy.new $TMP/package-$PACKAGE/etc/rc.d
+  CWD="`pwd`"
   cd $TMP/package-$PACKAGE
 fi
 
 find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-mkdir -p etc/rc.d
-cp $CWD/rc.privoxy.new etc/rc.d
-
 mkdir install
 cat << EOF > install/slack-desc
 # HOW TO EDIT THIS FILE:

diff --git a/tor/tor.SlackBuild b/tor/tor.SlackBuild
index abec1bb1a23bfebde443bf70c516034757794059..986eeed0349e398d0d2d15560f02466835e2d6a9 100755 (executable)
--- a/tor/tor.SlackBuild
+++ b/tor/tor.SlackBuild
@@ -81,13 +81,13 @@ fi
 make
 make DESTDIR=$TMP/package-$PACKAGE install
 
-CWD="`pwd`"
+mkdir $TMP/package-$PACKAGE/etc/rc.d
+cp $CWD/rc.tor.new $TMP/package-$PACKAGE/etc/rc.d
 
+CWD="`pwd`"
 cd $TMP/package-$PACKAGE
 
 mv etc/tor/tor-tsocks.conf etc/tor/tor-tsocks.conf.sample
-mkdir etc/rc.d
-cp $CWD/rc.tor.new etc/rc.d
 
 find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null