]> git.sesse.net Git - vlc/commitdiff
Some safety fix pointed by pjrm on irc
authorChristophe Mutricy <xtophe@videolan.org>
Sun, 5 Nov 2006 15:51:46 +0000 (15:51 +0000)
committerChristophe Mutricy <xtophe@videolan.org>
Sun, 5 Nov 2006 15:51:46 +0000 (15:51 +0000)
Makefile.am
configure.ac

index 9629cc13e591100fb87a50ed862ad05983e445ac..2bd2b19c22b91e8dadfa56bf68811034995e9049 100644 (file)
@@ -433,16 +433,16 @@ VLC-release.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
        case $(host_os) in \
-         *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
-           cd ../../../; \
+         *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+           cd ../../../ && \
            cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
                  $(top_builddir)/VLC-release.app;; \
-         *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
-           cd ../../../; \
+         *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+           cd ../../../ && \
            cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
                  $(top_builddir)/VLC-release.app;; \
-         *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
-           cd ../../../; \
+         *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+           cd ../../../ && \
            cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
                  $(top_builddir)/VLC-release.app;; \
        esac
@@ -575,16 +575,16 @@ VLC.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
        case $(host_os) in \
-         *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
-           cd ../../../; \
+         *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \
+           cd ../../../ && \
            cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
                  $(top_builddir)/VLC.app;; \
-         *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
-           cd ../../../; \
+         *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \
+           cd ../../../ && \
            cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
                  $(top_builddir)/VLC.app;; \
-         *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
-           cd ../../../; \
+         *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+           cd ../../../ && \
            cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
                  $(top_builddir)/VLC.app;; \
        esac
@@ -858,7 +858,7 @@ package-beos:
        xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
        find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
        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} $(srcdir)/tmp/vlc ;
 
@@ -869,7 +869,7 @@ package-beos:
        xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
        find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
        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)/ ;
 
 # Clean up
@@ -965,7 +965,7 @@ package-translations:
 update-po:
        rm -f $(top_srcdir)/po/POTFILES.in
        { \
-         cd $(top_srcdir) ; \
+         cd $(top_srcdir) && \
          echo "# automatically created by make update-po" ; \
          echo "" ; \
          echo "# main sources" ; \
index 7b29b0f1f2b3338fc9dd1e55f8ecef9fdeb20e74..5c92fc7b9b7b9761b8e244e381154e6b9cb9975d 100644 (file)
@@ -5670,7 +5670,7 @@ dnl Shortcut to nice compile message
 rm -f 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
 chmod a+x compile