aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/macosx
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2012-02-16 16:31:09 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2012-02-16 16:31:09 +0000
commit149f655c58229153e7045ea5a4cb91bf54299b7d (patch)
tree6e8b3522dc80a2a75920161d3509ba805a8343b1 /packaging/macosx
parentf984b230b21e353c1b8a6691580684ddc9981966 (diff)
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. svn path=/trunk/; revision=41040
Diffstat (limited to 'packaging/macosx')
-rw-r--r--packaging/macosx/Makefile.am10
-rw-r--r--packaging/macosx/Wireshark_package.pmdoc/01wireshark-contents.xml (renamed from packaging/macosx/Wireshark package.pmdoc/01wireshark-contents.xml)0
-rw-r--r--packaging/macosx/Wireshark_package.pmdoc/01wireshark.xml (renamed from packaging/macosx/Wireshark package.pmdoc/01wireshark.xml)0
-rw-r--r--packaging/macosx/Wireshark_package.pmdoc/02chmodbpf-contents.xml (renamed from packaging/macosx/Wireshark package.pmdoc/02chmodbpf-contents.xml)0
-rw-r--r--packaging/macosx/Wireshark_package.pmdoc/02chmodbpf.xml (renamed from packaging/macosx/Wireshark package.pmdoc/02chmodbpf.xml)0
-rw-r--r--packaging/macosx/Wireshark_package.pmdoc/03utility-contents.xml (renamed from packaging/macosx/Wireshark package.pmdoc/03utility-contents.xml)0
-rw-r--r--packaging/macosx/Wireshark_package.pmdoc/03utility.xml (renamed from packaging/macosx/Wireshark package.pmdoc/03utility.xml)0
-rw-r--r--packaging/macosx/Wireshark_package.pmdoc/index.xml (renamed from packaging/macosx/Wireshark package.pmdoc/index.xml)0
-rwxr-xr-xpackaging/macosx/osx-dmg.sh2
9 files changed, 10 insertions, 2 deletions
diff --git a/packaging/macosx/Makefile.am b/packaging/macosx/Makefile.am
index 8c54717721..d01e60f6d3 100644
--- 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
index bc1e5a791f..bc1e5a791f 100644
--- a/packaging/macosx/Wireshark package.pmdoc/01wireshark-contents.xml
+++ b/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
index 1c7f2427b0..1c7f2427b0 100644
--- a/packaging/macosx/Wireshark package.pmdoc/01wireshark.xml
+++ b/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
index bc1e5a791f..bc1e5a791f 100644
--- a/packaging/macosx/Wireshark package.pmdoc/02chmodbpf-contents.xml
+++ b/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
index c795f60f9a..c795f60f9a 100644
--- a/packaging/macosx/Wireshark package.pmdoc/02chmodbpf.xml
+++ b/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
index 708bcaeb25..708bcaeb25 100644
--- a/packaging/macosx/Wireshark package.pmdoc/03utility-contents.xml
+++ b/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
index 169a298bf8..169a298bf8 100644
--- a/packaging/macosx/Wireshark package.pmdoc/03utility.xml
+++ b/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
index a05d1414fa..a05d1414fa 100644
--- a/packaging/macosx/Wireshark package.pmdoc/index.xml
+++ b/packaging/macosx/Wireshark_package.pmdoc/index.xml
diff --git a/packaging/macosx/osx-dmg.sh b/packaging/macosx/osx-dmg.sh
index 882338ab2a..f37879e732 100755
--- 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