As suggested on the -dev list today, add Wireshark_package.pmdoc to the source

distribution.

To do this, however, requires renaming that directory because automake can't
handle files with spaces in their names.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41040 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packaging/macosx/Makefile.am b/packaging/macosx/Makefile.am
index 8c54717721483bdf288493bae50742222da6653b..d01e60f6d3c0c1375953b076b40b2cd78e656c19 100644 (file)
--- a/packaging/macosx/Makefile.am
+++ b/packaging/macosx/Makefile.am
@@ -80,7 +80,15 @@ EXTRA_DIST = \
        Scripts/wireshark-postinstall.sh        \
        utility-launcher        \
        root.ds_store   \
-       util.ds_store
+       util.ds_store   \
+       Wireshark_package.pmdoc/01wireshark-contents.xml        \
+       Wireshark_package.pmdoc/01wireshark.xml         \
+       Wireshark_package.pmdoc/02chmodbpf-contents.xml \
+       Wireshark_package.pmdoc/02chmodbpf.xml                  \
+       Wireshark_package.pmdoc/03utility-contents.xml          \
+       Wireshark_package.pmdoc/03utility.xml                   \
+       Wireshark_package.pmdoc/index.xml
+
 
 COPYING.txt: ../../COPYING
        cp $< $@

diff --git a/packaging/macosx/Wireshark package.pmdoc/01wireshark-contents.xml b/packaging/macosx/Wireshark_package.pmdoc/01wireshark-contents.xml
similarity index 100%
rename from packaging/macosx/Wireshark package.pmdoc/01wireshark-contents.xml
rename to packaging/macosx/Wireshark_package.pmdoc/01wireshark-contents.xml

diff --git a/packaging/macosx/Wireshark package.pmdoc/01wireshark.xml b/packaging/macosx/Wireshark_package.pmdoc/01wireshark.xml
similarity index 100%
rename from packaging/macosx/Wireshark package.pmdoc/01wireshark.xml
rename to packaging/macosx/Wireshark_package.pmdoc/01wireshark.xml

diff --git a/packaging/macosx/Wireshark package.pmdoc/02chmodbpf-contents.xml b/packaging/macosx/Wireshark_package.pmdoc/02chmodbpf-contents.xml
similarity index 100%
rename from packaging/macosx/Wireshark package.pmdoc/02chmodbpf-contents.xml
rename to packaging/macosx/Wireshark_package.pmdoc/02chmodbpf-contents.xml

diff --git a/packaging/macosx/Wireshark package.pmdoc/02chmodbpf.xml b/packaging/macosx/Wireshark_package.pmdoc/02chmodbpf.xml
similarity index 100%
rename from packaging/macosx/Wireshark package.pmdoc/02chmodbpf.xml
rename to packaging/macosx/Wireshark_package.pmdoc/02chmodbpf.xml

diff --git a/packaging/macosx/Wireshark package.pmdoc/03utility-contents.xml b/packaging/macosx/Wireshark_package.pmdoc/03utility-contents.xml
similarity index 100%
rename from packaging/macosx/Wireshark package.pmdoc/03utility-contents.xml
rename to packaging/macosx/Wireshark_package.pmdoc/03utility-contents.xml

diff --git a/packaging/macosx/Wireshark package.pmdoc/03utility.xml b/packaging/macosx/Wireshark_package.pmdoc/03utility.xml
similarity index 100%
rename from packaging/macosx/Wireshark package.pmdoc/03utility.xml
rename to packaging/macosx/Wireshark_package.pmdoc/03utility.xml

diff --git a/packaging/macosx/Wireshark package.pmdoc/index.xml b/packaging/macosx/Wireshark_package.pmdoc/index.xml
similarity index 100%
rename from packaging/macosx/Wireshark package.pmdoc/index.xml
rename to packaging/macosx/Wireshark_package.pmdoc/index.xml

diff --git a/packaging/macosx/osx-dmg.sh b/packaging/macosx/osx-dmg.sh
index 882338ab2a2b994b2add3019bd29f1514b43789d..f37879e73225c5f3e9851e04ee36873c047fb4db 100755 (executable)
--- a/packaging/macosx/osx-dmg.sh
+++ b/packaging/macosx/osx-dmg.sh
@@ -132,7 +132,7 @@ echo -e "\nCREATE WIRESHARK PACKAGE\n"
 pkg_title="$volume_name $version $architecture"
 pkg_file="$pkg_title.pkg"
 rm -rf "$pkg_file"
-/Developer/usr/bin/packagemaker --doc "Wireshark package.pmdoc" \
+/Developer/usr/bin/packagemaker --doc "Wireshark_package.pmdoc" \
     --title "$pkg_title" \
     --version "$version" \
     --verbose || exit 1