videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

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

Use makensis when it's installed in the default location.
Patch by Hannes Domani
This commit is contained in:
Rafaël Carré 2007-09-17 23:36:25 +00:00
parent a07aa55c91
commit 67cb64706d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -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 \

4
modules/gui/qt4/Modules.am
View File

@ -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