OSX package: add dependencies on ChangeLog, copy it from builddir everywhere

[vlc] / extras / package / macosx / package.mak

diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak
index 0088958b36fc00eb2d24df1b6d28e816d0536adf..0bfae858287790dbfe48e37babf55297b0c703ea 100644 (file)
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -92,7 +92,7 @@ VLC-tmp.app: vlc
          $(INSTALL) -d $@/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
          $(INSTALL) $(srcdir)/po/$${i}.gmo $@/Contents/MacOS/share/locale/$${i}/LC_MESSAGES/vlc.mo; \
          mkdir -p $@/Contents/Resources/$${i}.lproj/ ; \
-         $(LN_S) -f ../English.lproj/InfoPlist.strings ../English.lproj/MainMenu.xib \
+         $(LN_S) -f ../English.lproj/InfoPlist.strings ../English.lproj/MainMenu.nib \
                $@/Contents/Resources/$${i}.lproj/ ; \
        done
        printf "APPLVLC#" >| $@/Contents/PkgInfo
@@ -111,21 +111,24 @@ package-macosx: VLC-release.app ChangeLog
        hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-$(VERSION)" "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -scrub
 # Make sure the image is not writable
 # Note: We can't directly create a read only dmg as we do the bless stuff
+       rm -f "$(top_builddir)/vlc-$(VERSION).dmg"
        hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDBZ -o "$(top_builddir)/vlc-$(VERSION).dmg"
        ls -l "$(top_builddir)/vlc-$(VERSION).dmg"
 
-package-macosx-zip: VLC-release.app
-       mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies
+package-macosx-zip: VLC-release.app ChangeLog
+       mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/
        cp -R $(top_builddir)/VLC-release.app $(top_builddir)/vlc-$(VERSION)/VLC.app
-       cd $(srcdir); cp AUTHORS COPYING ChangeLog README THANKS NEWS extras/package/macosx/Delete_Preferences.app \
-               $(abs_top_builddir)/vlc-$(VERSION)/Goodies
+       cp $(top_builddir)/ChangeLog $(top_builddir)/vlc-$(VERSION)/Goodies/
+       cd $(srcdir); cp AUTHORS COPYING README THANKS NEWS extras/package/macosx/Delete_Preferences.app \
+               $(abs_top_builddir)/vlc-$(VERSION)/Goodies/
        cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf
        zip -r -y -9 $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION)
 
-package-macosx-framework-zip:
+package-macosx-framework-zip: ChangeLog
        mkdir -p $(top_builddir)/vlckit-$(VERSION)/Goodies/
        cp -R $(srcdir)/projects/macosx/framework/build/Debug/VLCKit.framework $(top_builddir)/vlckit-$(VERSION)/
-       cd $(srcdir); cp AUTHORS COPYING ChangeLog README THANKS NEWS $(abs_top_builddir)/vlckit-$(VERSION)/Goodies/
+       cp $(top_builddir)/ChangeLog $(top_builddir)/vlckit-$(VERSION)/Goodies/
+       cd $(srcdir); cp AUTHORS COPYING README THANKS NEWS $(abs_top_builddir)/vlckit-$(VERSION)/Goodies/
        zip -r -y -9 $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION)
 
 package-translations: