Do not forget to register aout_ChannelsRestart as the callback for

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bf5c89efdae3168712d14dd1cf419165f6ac691f..8e29cf94d5befd23b57bb5c96c14d0cd71da412e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -475,7 +475,7 @@ vlc.app: vlc $(PLUGIN_FILES)
        $(INSTALL) -d vlc.app/Contents/MacOS/locale
        for i in $(CATALOGS); do \
                mkdir -p vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES ; \
-               cp po/$$i vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES/vlc.mo ; \
+               cp po/$$i vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES/vlc.mo || true ; \
        done
        echo -n "APPLVLC#" >| vlc.app/Contents/PkgInfo
 endif
@@ -517,12 +517,12 @@ package-win32:
        fi ; done
 # don't include these two
 #rm -f tmp/plugins/gtk.so tmp/plugins/sdl.so
-       for i in dummy tmp/plugins/*.so ; do if test $$i != tmp/plugins/intfwin.so -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
+       for i in dummy tmp/plugins/*$(LIBEXT) ; do if test $$i != tmp/plugins/intfwin.so -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
        mkdir tmp/share
        for file in default8x16.psf default8x9.psf ; \
                do cp share/$$file tmp/share/ ; done
 # Create package 
-       wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} /CD tmp/nsi
+       wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} tmp/nsi
 # Clean up
        rm -Rf tmp
 
@@ -547,7 +547,7 @@ package-beos:
        for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
                $(INSTALL) $$i tmp/vlc/plugins/ ; \
        fi ; done
-       for i in dummy tmp/vlc/plugins/*.so ; do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done
+       for i in dummy tmp/vlc/plugins/*$(LIBEXT) ; do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done
 # Create package 
        mv tmp/vlc tmp/vlc-${VERSION}
        (cd tmp ; find vlc-${VERSION} | \