From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9330:

[metze/wireshark/wip.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 31c823931d891419982425f8ade08f28a2f589cb..91285870e9ec70e0e4c661aa6a5db6a0bf40477b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -809,10 +809,12 @@ EXTRA_DIST = \
        image/minus-8.png                       \
        image/nsis-checked.bmp                  \
        image/nsis-unchecked.bmp                \
+       image/openhand-16.png                   \
        image/plus-8.png                        \
        image/rawshark.rc.in                    \
        image/README.image                      \
        image/reordercap.rc.in                  \
+       image/rubberband-16.png                 \
        image/status.qrc                        \
        image/stock_dialog_error_48.xpm         \
        image/stock_dialog_info_48.xpm          \
@@ -1082,7 +1084,7 @@ install_desktop_files:
 
 # Used by svr4-package and osx-package
 # We load top_stagedir with an explicit path so that libtool doesn't freak.
-top_stagedir=`cd $(top_srcdir) && pwd`/packaging/staging
+top_stagedir=`cd $(top_builddir) && pwd`/packaging/staging
 stagedir=$(top_stagedir)/$(PACKAGE).inst
 
 host_cpu=@host_cpu@
@@ -1148,7 +1150,7 @@ osx-package: osx-app packaging/macosx/COPYING.txt
        @if test x$(HAVE_OSX_PACKAGING) = xyes ; then \
                cd $(srcdir)/packaging/macosx ;  \
                chmod +x ./osx-dmg.sh ; \
-               ./osx-dmg.sh ; \
+               ./osx-dmg.sh @OSX_DMG_FLAGS@ ; \
        fi
 
 osx-install: osx-app