Skip to content

V
vlc-1.1
Commit 04a605b1 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* Makefile.am: on Unix, use makensis -DVERSION; on Win32, use /DVERSION.

parent 125a27bb
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
Makefile.am
View file @ 04a605b1
...@@ -932,15 +932,15 @@ package-win32-base: package-win32-base-debug ...@@ -932,15 +932,15 @@ package-win32-base: package-win32-base-debug
package-win32-base-exe: package-win32-base-exe:
# Create package # Create package
if makensis -VERSION >/dev/null 2>&1; then \ if makensis -VERSION >/dev/null 2>&1; then \
MAKENSIS=makensis; \ 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"; \ MAKENSIS="/cygdrive/c/Program\ Files/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"; \ MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=${VERSION}"; \
else \ else \
echo 'Error: cannot locate makensis tool'; exit 1; \ echo 'Error: cannot locate makensis tool'; exit 1; \
fi; \ fi; \
eval "$$MAKENSIS /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi" eval "$$MAKENSIS $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi"
package-win32-base-exe-cygwin: package-win32-base-exe package-win32-base-exe-cygwin: package-win32-base-exe
# Create package # Create package
......
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