X-Git-Url: http://www.privoxy.org/gitweb/index.html?a=blobdiff_plain;f=constructPkgContent.sh;h=904803f55c7c37d875ae9fcbcfa623808ef08354;hb=07805356ffa905e8331895a668040120173d0d44;hp=ac2edb2b06690269f92153dea6fa5a3e6d20df86;hpb=030221d958b74b3e1d13e0cc9d4d23018f951c8d;p=OSXPackageBuilder.git

diff --git a/constructPkgContent.sh b/constructPkgContent.sh
index ac2edb2..904803f 100755
--- a/constructPkgContent.sh
+++ b/constructPkgContent.sh
@@ -51,6 +51,7 @@ echo ""
 echo ""
 echo "Copy the compiled privoxy binary from the '${SOURCE_DIR}' directory"
 echo ""
+mkdir -vp pkg\ content/usr/local/sbin
 cp -v ../${SOURCE_DIR}/privoxy pkg\ content/usr/local/sbin
 
 # Copy the configuration hierarchy from the '${SOURCE_DIR}' directory
@@ -58,6 +59,7 @@ echo ""
 echo ""
 echo "Copy most of the configuration hierarchy from the '${SOURCE_DIR}' directory"
 echo ""
+mkdir -vp pkg\ content/usr/local/etc/privoxy/vanilla
 for i in default.action default.filter match-all.action trust user.action user.filter templates; do
 	if [ "$i" = "templates" ]; then
 		# for the templates subfolder copy all files therein
@@ -83,6 +85,7 @@ echo ""
 echo ""
 echo "Copy the documentation hierarchy from the '${SOURCE_DIR}' directory"
 echo ""
+mkdir -vp pkg\ content/usr/local/share/doc/privoxy
 # copy the required directory hierarchies
 for i in developer-manual faq images man-page team user-manual; do
 	cp -vR ../${SOURCE_DIR}/doc/webserver/$i pkg\ content/usr/local/share/doc/privoxy/$i
@@ -91,6 +94,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
@@ -101,19 +106,8 @@ echo ""
 echo ""
 echo "Copy the manpage from the '${SOURCE_DIR}' directory"
 echo ""
-cp -v ../${SOURCE_DIR}/privoxy.1 pkg\ content/usr/local/share/man/man1
-
-# Optionally copy the PCRE libraries
-if [ "$1" == "-pcre" ]; then
-	echo ""
-	echo ""
-	echo "Copy the external PCRE libraries"
-	echo ""
-	mkdir pkg\ content/usr/local/lib
-	cp -v /usr/local/lib/libpcre* pkg\ content/usr/local/lib
-	mkdir pkg\ content/usr/local/lib/pkgconfig
-	cp -v /usr/local/lib/pkgconfig/libpcre* pkg\ content/usr/local/lib/pkgconfig
-fi
+mkdir -vp pkg\ content/usr/local/share/man/man1
+cp -v ../${SOURCE_DIR}/privoxy.8 pkg\ content/usr/local/share/man/man1
 
 # Remove CVS administration files
 echo ""
@@ -122,4 +116,3 @@ echo "Remove CVS administration files"
 echo ""
 find pkg\ content -name CVS.sandboxinfo -exec rm -rf {} \;
 find pkg\ content -name CVS -exec rm -rf {} \;
-