diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-12 22:27:41 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-12 22:27:41 +0000 |
| commit | a36e595c8dbc917ce20ba6dbeef7cf5c8f5caef0 (patch) | |
| tree | 7ab8197cb216b0dae18375094603a6aca5582045 /packaging | |
| parent | 86a6a0c2a4386b287333cdb5626b1525a8ea5b89 (diff) | |
| download | wireshark-a36e595c8dbc917ce20ba6dbeef7cf5c8f5caef0.tar.gz | |
Don't try to build NSIS installer if MAKENSIS not defined in config.nmake.
Fixes Bug #3362.
Also: Use _FORCE_ instead of FORCE as dummy target.
svn path=/trunk/; revision=31510
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 25b58251c5..e7c19f1518 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -74,7 +74,14 @@ NSI=wireshark.nsi \ DELIVERABLES=$(EXE) $(DLL) $(DOC) $(DOC_dos) $(GPL) $(HELP) $(PLUGINS) +!IFDEF MAKENSIS all: NEWS.txt wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe +!ELSE +all: _FORCE_ + @echo ? NSIS not available (MAKENSIS not defined in config.nmake) + @echo. + @exit 1 +!ENDIF NEWS.txt: ../../NEWS $(UNIX2DOS) < ../../NEWS > NEWS.txt @@ -185,3 +192,7 @@ $(EXE) $(DLL): cd ../.. $(MAKE) /$(MAKEFLAGS) -f makefile.nmake cd packaging/nsis + +#### +_FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory + |