Remove unnecessary copying of PCRE library files - the package template picks them...

[OSXPackageBuilder.git] / constructPkgContent.sh

diff --git a/constructPkgContent.sh b/constructPkgContent.sh
index ff6b617..904803f 100755 (executable)
--- 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
@@ -103,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 ""
@@ -124,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 {} \;
-