UI: Sprefs_int cosmetics

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fa3a571c88978eb1d335800f875a0127b0be65f8..5de28caa739a61b89a4ade543812c3350732102b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -588,6 +588,7 @@ VLC-release.app: vlc
        printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo
        find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name classes.nib -delete;
        find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name info.nib -delete;
+       find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name designable.nib -delete;
        find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \;
        find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
 
@@ -1083,12 +1084,13 @@ package-macosx: VLC-release.app ChangeLog
        else \
          cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"; \
        fi
-       cd "$(srcdir)" && mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \
+       mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \
           mkdir -p $(top_builddir)/vlc-$(VERSION)/.background/ && \
-          cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \
-          cp -R  extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \
-         cp extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \
-         cp extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png
+          cp $(srcdir)/AUTHORS $(srcdir)/COPYING $(srcdir)/README $(srcdir)/THANKS $(srcdir)/NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \
+          cp -R  $(srcdir)/extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \
+         cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \
+         cp $(srcdir)/extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png
+       cp -L $(top_builddir)/ChangeLog $(top_builddir)/vlc-$(VERSION)/Goodies/
 
 # Place a link to the application folder
        ln -s /Applications $(top_builddir)/vlc-$(VERSION)/Applications
@@ -1126,7 +1128,7 @@ package-macosx: VLC-release.app ChangeLog
 # Note: We can't directly create a read only dmg as we do the bless stuff
        echo "Make the disk image read-only"
        mv "$(top_builddir)/vlc-$(VERSION).dmg" "$(top_builddir)/vlc-$(VERSION)-rw.dmg"
-       hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDZO -o "$(top_builddir)/vlc-$(VERSION).dmg"
+       hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDBZ -o "$(top_builddir)/vlc-$(VERSION).dmg"
        rm "$(top_builddir)/vlc-$(VERSION)-rw.dmg"
 
 # We are done
@@ -1179,8 +1181,8 @@ if BUILD_MOZILLA
        fi; \
        $${PACKAGEMAKER} -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
        -f "$(top_builddir)/macosx-plugin-instdata" \
-       -i "$(srcdir)/extras/package/macosx/plugin/InstallerInfo.plist" \
-       -d "$(srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true
+       -i "$(top_builddir)/extras/package/macosx/plugin/InstallerInfo.plist" \
+       -d "$(top_srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true
        rm -rf "$(top_builddir)/macosx-plugin-instdata/"
 
 # Create disk image 
@@ -1189,7 +1191,7 @@ if BUILD_MOZILLA
        mkdir -p "$(top_builddir)/vlc-plugin-$(VERSION)/"
        mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-$(VERSION)/"
        hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-$(VERSION)" \
-         "$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDZO \
+         "$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDBZ \
          -scrub -imagekey zlib-level=9
        echo "Disk image creation completed:"
        rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)"