Avoid using sed -i which seems to be non standard.

Use makensis when it's installed in the default location.
Patch by Hannes Domani

diff --git a/Makefile.am b/Makefile.am
index 070d80b89aa6d310e5dc0324cb26e93506661bd7..7b2a9e8ff03576be6c856503a17b33345bc61285 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -746,8 +746,11 @@ package-win32-base-debug: package-win-common
                done; \
        done
        unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg;
-       sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
-       sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 
+       for file in $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; do \
+               if sed 's%share/osdmenu%osdmenu%g' $$file >$$file.tmp; then :; else exit 1; fi; \
+               if sed 's%/%\\%g' $$file.tmp >$$file; then :; else exit 1; fi; \
+               rm -f $$file.tmp; \
+       done
 
 
 package-win32-base: package-win32-base-debug package-win-common-strip
@@ -760,6 +763,8 @@ package-win32-base-exe: package-win32-base
            MAKENSIS="makensis -DVERSION=${VERSION}"; \
        elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
            MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=${VERSION}"; \
+       elif [ -x "${PROGRAMFILES}/NSIS/makensis" ]; then \
+           MAKENSIS="${PROGRAMFILES}/NSIS/makensis -DVERSION=${VERSION}"; \
        elif wine --version >dev/null 2>&1; then \
            MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=${VERSION}"; \
        else \

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index cc899ab648370d62f230aaa88efefa6145d94809..581a3821d64c0032448927b6ef313a546d5aa7ea 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -78,8 +78,8 @@ resources.cpp: res.qrc
        rm -f $@ $@.tmp
        echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
        $(UIC) -tr "Q_" $< >> $@.tmp
-       sed -i -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp
-       mv -f $@.tmp $@
+       sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
+       rm -f $@.tmp
 
 dialogs/help.cpp: dialogs/about.hpp