diff options
| author | Guy Harris <guy@alum.mit.edu> | 2008-06-13 16:52:45 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2008-06-13 16:52:45 +0000 |
| commit | ff8881072b25a4986e2336cb6a49b84d9cdc579b (patch) | |
| tree | bbfb0a6fca00134232443a87e1680efc4ba3eaee | |
| parent | d1acd0ac9a8b0dbeca4a0558124d4e7163c77131 (diff) | |
| download | wireshark-ff8881072b25a4986e2336cb6a49b84d9cdc579b.tar.gz | |
We half-enabled the Mac OS X packaging stuff, which meant that we
weren't including in the tarball stuff the packaging/macosx/Makefile.in
file that that the configure script from the tarball was trying to
expand. Add macosx to the list of directories in packaging/Makefile.am,
and update the comment in packaging/macosx/Makefile.am to reflect the
enabling of the OS X packaging stuff.
svn path=/trunk/; revision=25449
| -rw-r--r-- | packaging/Makefile.am | 2 | ||||
| -rw-r--r-- | packaging/macosx/Makefile.am | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/packaging/Makefile.am b/packaging/Makefile.am index 5860a8b391..a6b7d71670 100644 --- a/packaging/Makefile.am +++ b/packaging/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = rpm svr4 nsis +SUBDIRS = macosx rpm svr4 nsis MAINTAINERCLEANFILES = \ Makefile.in diff --git a/packaging/macosx/Makefile.am b/packaging/macosx/Makefile.am index 5b2ba85e33..d58b11c3d5 100644 --- a/packaging/macosx/Makefile.am +++ b/packaging/macosx/Makefile.am @@ -1,10 +1,12 @@ # -# This is currently disabled, since the contents of the +# This was disabled at one point, since the contents of the # Clearlooks-Quicksilver-OSX directory exceed the 99-character file -# name limit imposed by tar. +# name limit imposed by the old tar format. We now use ustar format, +# which doesn't have that limitation. # -# To reenable this file, add "macosx" to SUBDIRS in ../Makefile.am and -# add an entry for this Makefile.am to AC_SUBST in ../../configure.in. +# To re-disable this file, remove "macosx" to SUBDIRS in ../Makefile.am and +# remove the entries for this Makefile.am and Info.plist from AC_OUTPUT +# in ../../configure.in. # MAINTAINERCLEANFILES = \ Makefile.in |