diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-09-02 17:55:48 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-03 01:05:40 +0000 |
| commit | b03eeeb0aa1df30a3099323ec26419b0d063c94a (patch) | |
| tree | 70165f28e6a89ddba4d425c3e62954f65001bad9 /packaging/portableapps/win32/Makefile.nmake | |
| parent | d3e116466cd27d68a5c0cc066854a9d59264adc6 (diff) | |
Fix the PortableApps package name.
Remove Installer.nsi while we're here.
Change-Id: I739d5d825fd76eac9b50d26fab2d44e853dc83f9
Reviewed-on: https://code.wireshark.org/review/3965
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/portableapps/win32/Makefile.nmake')
| -rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake index 15995f337b..311e44c997 100644 --- a/packaging/portableapps/win32/Makefile.nmake +++ b/packaging/portableapps/win32/Makefile.nmake @@ -96,6 +96,7 @@ $(APPINFO_INI): dirs appinfo.tmpl $(TOPDIR)\config.nmake sed -e 's/$$(PAPPS_VERSION)/$(PAPPS_VERSION)/g' \ -e 's/$$(VERSION_MAJOR)/$(VERSION_MAJOR)/g' \ -e 's/$$(VERSION_MINOR)/$(VERSION_MINOR)/g' \ + -e 's/$$(VERSION_MICRO)/$(VERSION_MICRO)/g' \ < appinfo.tmpl > $@ $(LAUNCHER_INI): dirs $(PROGRAM_PORTABLE).ini @@ -144,6 +145,8 @@ WiresharkPortable-$(VERSION).paf.exe : dirs appinfo appbinaries source !IFDEF PORTABLEAPPS_DIR $(PORTABLEAPPS_DIR)\PortableApps.comInstaller\PortableApps.comInstaller.exe \ $(MAKEDIR)\$(PROGRAM_PORTABLE) + mv WiresharkPortable_$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).paf.exe \ + WiresharkPortable-$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).paf.exe !ELSE !MESSAGE PORTABLEAPPS_DIR not configured in config.nmake. Skipping. !ENDIF |