Avoid dummy error

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 21e7230470bb4de5837e9df4292866e977c5293d..5d8065cf976ae9d2276ed9f1d4316c4465b0bdde 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,9 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
 
 SUFFIXES = 
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
+DISTCHECK_CONFIGURE_FLAGS = \
+       --enable-fast-install \
+       --disable-dvd --disable-mad --disable-libmpeg2 \
        --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
        --disable-fribidi --disable-glx
 
@@ -69,6 +71,7 @@ AUTOMAKE_OPTIONS = \
 
 ChangeLog: Makefile.am
        rm -f -- "$@"
+       cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
        ln -sf doc/ChangeLog-2008 "$@"
 
 ###############################################################################
@@ -265,7 +268,8 @@ EXTRA_DIST += \
        extras/package/macosx/eyetvplugin/eyetvplugin.h \
        extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \
        extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \
-       extras/package/macosx/README.MacOSX.rtf
+       extras/package/macosx/README.MacOSX.rtf \
+       extras/package/macosx/Info.plist
 
 
 ###############################################################################
@@ -348,7 +352,7 @@ endif
 
 ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
 bin_SCRIPTS = $(ALIASES)
-CLEANFILES += $(ALIASES)
+CLEANFILES += $(ALIASES) $(noinst_SCRIPTS)
 EXTRA_SCRIPTS = $(ALL_ALIASES)
 
 dist_noinst_SCRIPTS += make-alias
@@ -398,7 +402,7 @@ VLC-release.app: vlc
        rm -Rf "$(top_builddir)/tmp"
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC-release.app
-       for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+       for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
        for i in AUTHORS COPYING THANKS; do \
@@ -558,7 +562,7 @@ VLC.app: vlc
        rm -Rf $(top_builddir)/tmp
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC.app
-       for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+       for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
        for i in AUTHORS COPYING THANKS; do \
@@ -857,13 +861,13 @@ package-win32-base: package-win32-base-debug package-win-common-strip
 package-win32-base-exe: package-win32-base
 # Create package
        if makensis -VERSION >/dev/null 2>&1; then \
-           MAKENSIS="makensis -DVERSION=$(VERSION)"; \
+           MAKENSIS="makensis"; \
        elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
-           MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=$(VERSION)"; \
+           MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis)"; \
        elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \
-           MAKENSIS="$(PROGRAMFILES)/NSIS/makensis -DVERSION=$(VERSION)"; \
+           MAKENSIS="$(PROGRAMFILES)/NSIS/makensis"; \
        elif wine --version >/dev/null 2>&1; then \
-           MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=$(VERSION)"; \
+           MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \
        else \
            echo 'Error: cannot locate makensis tool'; exit 1; \
        fi; \
@@ -874,7 +878,7 @@ package-win32-base-exe-cygwin: package-win32-base-exe
 
 package-win32-base-exe-linux:
 # Create package
-       makensis -DVERSION=$(VERSION) $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi
+       makensis $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi
 
 package-win32-base-zip: package-win32-base
 # Create package