Commit 67cb6470 authored by Rafaël Carré's avatar Rafaël Carré
Browse files

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

Use makensis when it's installed in the default location.
Patch by Hannes Domani
parent a07aa55c
...@@ -746,8 +746,11 @@ package-win32-base-debug: package-win-common ...@@ -746,8 +746,11 @@ package-win32-base-debug: package-win-common
done; \ done; \
done done
unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg;
sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg for file in $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; do \
sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 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 package-win32-base: package-win32-base-debug package-win-common-strip
...@@ -760,6 +763,8 @@ package-win32-base-exe: package-win32-base ...@@ -760,6 +763,8 @@ package-win32-base-exe: package-win32-base
MAKENSIS="makensis -DVERSION=${VERSION}"; \ MAKENSIS="makensis -DVERSION=${VERSION}"; \
elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \ 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 /DVERSION=${VERSION}"; \
elif [ -x "${PROGRAMFILES}/NSIS/makensis" ]; then \
MAKENSIS="${PROGRAMFILES}/NSIS/makensis -DVERSION=${VERSION}"; \
elif wine --version >dev/null 2>&1; then \ 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 /DVERSION=${VERSION}"; \
else \ else \
......
...@@ -78,8 +78,8 @@ resources.cpp: res.qrc ...@@ -78,8 +78,8 @@ resources.cpp: res.qrc
rm -f $@ $@.tmp rm -f $@ $@.tmp
echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
$(UIC) -tr "Q_" $< >> $@.tmp $(UIC) -tr "Q_" $< >> $@.tmp
sed -i -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
mv -f $@.tmp $@ rm -f $@.tmp
dialogs/help.cpp: dialogs/about.hpp dialogs/help.cpp: dialogs/about.hpp
......
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