vlc/vlc-2.0 | branch: master | Rafaël Carré <[email protected]> | Mon Jan 2
19:47:11 2012 -0500| [2528cb4fdb94999865976533ed3c6140712dd5de] | committer:
Rafaël Carré
VLC-tmp.app : remove .app suffix
It doesn't give an OSX application
(cherry picked from commit ffdd8bedfe9dc865236b196739a7614aa2867b91)
Conflicts:
extras/package/macosx/package.mak
Signed-off-by: Rafaël Carré <[email protected]>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=2528cb4fdb94999865976533ed3c6140712dd5de
---
extras/package/macosx/package.mak | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index f5699c5..07294a5 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -7,26 +7,26 @@ endif
# This is just for development purposes.
# The resulting VLC.app will only run in this tree.
-VLC.app: VLC-tmp.app
+VLC.app: VLC-tmp
rm -Rf $@
- cp -R VLC-tmp.app $@
+ cp -R VLC-tmp $@
$(INSTALL) -m 0755 $(top_builddir)/bin/.libs/vlc $@/Contents/MacOS/VLC
$(LN_S) -f ../../../modules $@/Contents/MacOS/plugins
- rm -Rf VLC-tmp.app
+ rm -Rf VLC-tmp
# VLC-release.app for packaging and giving it to your friends
# use package-macosx to get a nice dmg
-VLC-release.app: VLC-tmp.app
+VLC-release.app: VLC-tmp
rm -Rf $@
- cp -R VLC-tmp.app $@
+ cp -R VLC-tmp $@
PRODUCT="$@" ACTION="release-makefile" src_dir=$(srcdir)
build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
find $@ -type d -exec chmod ugo+rx '{}' \;
find $@ -type f -exec chmod ugo+r '{}' \;
rm -Rf $@/Contents/Frameworks/BGHUDAppKit.framework/Resources/
- rm -Rf VLC-tmp.app
+ rm -Rf VLC-tmp
# common target to a VLC bundle used by both the dev and the release build
-VLC-tmp.app: vlc
+VLC-tmp: vlc
$(AM_V_GEN)for i in src lib share; do \
(cd $$i && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd)); \
done
_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits
