Removed version numbering from installer package internal identifier

[OSXPackageBuilder.git] / constructPkgContent.sh

diff --git a/constructPkgContent.sh b/constructPkgContent.sh
index e9856b2..b7da5fd 100755 (executable)
--- a/constructPkgContent.sh
+++ b/constructPkgContent.sh
@@ -28,7 +28,8 @@
 #                USA
 #
 # Modification : If you modify this file please consider whether your 
-#                changes ought to be passed back to the macsetup module.
+#                changes ought to be passed back to the OSXPackageBuilder
+#                module.
 #
 
 # Use the common script to locate the directory containing Privoxy's source ($SOURCEDIR)
@@ -45,13 +46,6 @@ echo "Copy the package skeleton (the unchanging content) to a new folder named '
 echo ""
 cp -vR pkg\ content\ skeleton pkg\ content
 
-# Replace the version number placeholders in the uninstallation script
-echo ""
-echo "Replace the version number placeholders in the uninstallation script"
-echo ""
-VERSION=`perl findversion.pl ../${SOURCE_DIR}/ChangeLog`
-sed "s/PRIVOXY_VERSION/${VERSION}/g" pkg\ content\ skeleton/Applications/Privoxy/uninstall.command > pkg\ content/Applications/Privoxy/uninstall.command
-
 # Copy the compiled privoxy binary from the '${SOURCE_DIR}' directory
 echo ""
 echo ""
@@ -108,6 +102,18 @@ 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
+
 # Remove CVS administration files
 echo ""
 echo ""