Skip to content

V
vlc-2-2
Commit 900ba538 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files
Options

Some safety fix pointed by pjrm on irc

parent 5c0d53e4
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
Makefile.am
View file @ 900ba538
...@@ -433,16 +433,16 @@ VLC-release.app: vlc ...@@ -433,16 +433,16 @@ VLC-release.app: vlc
$(top_builddir)/tmp/modules/gui/macosx; \ $(top_builddir)/tmp/modules/gui/macosx; \
done done
case $(host_os) in \ case $(host_os) in \
*darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
cd ../../../; \ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC-release.app;; \ $(top_builddir)/VLC-release.app;; \
*darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
cd ../../../; \ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC-release.app;; \ $(top_builddir)/VLC-release.app;; \
*darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
cd ../../../; \ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
$(top_builddir)/VLC-release.app;; \ $(top_builddir)/VLC-release.app;; \
esac esac
...@@ -575,16 +575,16 @@ VLC.app: vlc ...@@ -575,16 +575,16 @@ VLC.app: vlc
$(top_builddir)/tmp/modules/gui/macosx; \ $(top_builddir)/tmp/modules/gui/macosx; \
done done
case $(host_os) in \ case $(host_os) in \
*darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \
cd ../../../; \ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC.app;; \ $(top_builddir)/VLC.app;; \
*darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \
cd ../../../; \ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
$(top_builddir)/VLC.app;; \ $(top_builddir)/VLC.app;; \
*darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
cd ../../../; \ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
$(top_builddir)/VLC.app;; \ $(top_builddir)/VLC.app;; \
esac esac
...@@ -858,7 +858,7 @@ package-beos: ...@@ -858,7 +858,7 @@ package-beos:
xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ; mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
(cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} ) (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ; mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ;
mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ; mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ;
...@@ -869,7 +869,7 @@ package-beos: ...@@ -869,7 +869,7 @@ package-beos:
xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ; mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
(cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} ) (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ; mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ;
# Clean up # Clean up
...@@ -965,7 +965,7 @@ package-translations: ...@@ -965,7 +965,7 @@ package-translations:
update-po: update-po:
rm -f $(top_srcdir)/po/POTFILES.in rm -f $(top_srcdir)/po/POTFILES.in
{ \ { \
cd $(top_srcdir) ; \ cd $(top_srcdir) && \
echo "# automatically created by make update-po" ; \ echo "# automatically created by make update-po" ; \
echo "" ; \ echo "" ; \
echo "# main sources" ; \ echo "# main sources" ; \
......
configure.ac
View file @ 900ba538
...@@ -5670,7 +5670,7 @@ dnl Shortcut to nice compile message ...@@ -5670,7 +5670,7 @@ dnl Shortcut to nice compile message
rm -f compile rm -f compile
echo '#! /bin/sh' >compile echo '#! /bin/sh' >compile
echo "PATH=$PATH LANG=C make \$* 2>&1| \\" >> compile echo "PATH=$PATH LANG=C make \$@ 2>&1| \\" >> compile
echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/make.pl' >> compile echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/make.pl' >> compile
chmod a+x compile chmod a+x compile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment