[vlc-devel] commit: fixed distribution as dmg if srcdir != top_builddir ( Felix Paul Kühne )

git version control git at videolan.org
Sat May 30 00:32:48 CEST 2009


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed May 27 11:55:14 2009 +0200| [b241cb486a82a5dea183bfe209708c81eb57f5e7] | committer: Jean-Baptiste Kempf 

fixed distribution as dmg if srcdir != top_builddir
(cherry picked from commit feec0f30c55220f3f0be73940899f036cc72c012)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b241cb486a82a5dea183bfe209708c81eb57f5e7
---

 Makefile.am |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 93a6e04..2061691 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1084,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




More information about the vlc-devel mailing list