X-Git-Url: http://www.privoxy.org/gitweb/installation.html?a=blobdiff_plain;f=constructPkgContent.sh;h=ff6b61783090ea9892a2033c6f133caced40951e;hb=0865b549006776a44f32efdcd938d0c820845623;hp=b7da5fd6370cc0a04208015e31e1384ea5f98ccd;hpb=ea824d135bad68ac0d4b1f24db7be4596819c24e;p=OSXPackageBuilder.git

diff --git a/constructPkgContent.sh b/constructPkgContent.sh
index b7da5fd..ff6b617 100755
--- a/constructPkgContent.sh
+++ b/constructPkgContent.sh
@@ -71,11 +71,12 @@ done
 # Enter the correct values for confdir and logdir into the config file 
 echo ""
 echo ""
-echo "Copy the config file from the '${SOURCE_DIR}' directory, modifying the confdir and logdir in passing"
+echo "Copy the config file from the '${SOURCE_DIR}' directory, modifying the confdir, logdir and user-manual settings in passing"
 echo ""
-sed 's/confdir ./confdir \/usr\/local\/etc\/privoxy/g' ../${SOURCE_DIR}/config > pkg\ content/usr/local/etc/privoxy/vanilla/config_temp
-sed 's/logdir ./logdir \/var\/log\/privoxy/g' pkg\ content/usr/local/etc/privoxy/vanilla/config_temp > pkg\ content/usr/local/etc/privoxy/vanilla/config
-rm -f pkg\ content/usr/local/etc/privoxy/vanilla/config_temp
+sed 's/confdir ./confdir \/usr\/local\/etc\/privoxy/g' ../${SOURCE_DIR}/config > pkg\ content/usr/local/etc/privoxy/vanilla/config_temp1
+sed 's/logdir ./logdir \/var\/log\/privoxy/g' pkg\ content/usr/local/etc/privoxy/vanilla/config_temp1 > pkg\ content/usr/local/etc/privoxy/vanilla/config_temp2
+sed 's/#user-manual http:\/\/www.privoxy.org\/user-manual\//user-manual \/usr\/local\/share\/doc\/privoxy\/user-manual\//g' pkg\ content/usr/local/etc/privoxy/vanilla/config_temp2 > pkg\ content/usr/local/etc/privoxy/vanilla/config
+rm -f pkg\ content/usr/local/etc/privoxy/vanilla/config_temp*
 
 # Copy the documentation hierarchy from the '${SOURCE_DIR}' directory
 echo ""
@@ -90,6 +91,8 @@ done
 for i in announce.txt p_doc.css privoxy-index.html; do
 	cp -v ../${SOURCE_DIR}/doc/webserver/$i pkg\ content/usr/local/share/doc/privoxy/$i
 done
+# copy p_doc.css down into user-manual subdir (as per the make install target)
+cp -v ../${SOURCE_DIR}/doc/webserver/p_doc.css pkg\ content/usr/local/share/doc/privoxy/user-manual/p_doc.css
 # copy the project's AUTHORS, ChangeLog, LICENSE and README files
 for i in AUTHORS ChangeLog LICENSE README; do
 	cp -v ../${SOURCE_DIR}/$i pkg\ content/usr/local/share/doc/privoxy/$i