aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/portableapps/Makefile.nmake
diff options
context:
space:
mode:
Diffstat (limited to 'packaging/portableapps/Makefile.nmake')
-rw-r--r--packaging/portableapps/Makefile.nmake13
1 files changed, 3 insertions, 10 deletions
diff --git a/packaging/portableapps/Makefile.nmake b/packaging/portableapps/Makefile.nmake
index efe08ea07e..6a25f928d0 100644
--- a/packaging/portableapps/Makefile.nmake
+++ b/packaging/portableapps/Makefile.nmake
@@ -19,11 +19,6 @@ SOURCE = $(OTHER)\Source
APPINFO_INI = $(APPINFO)\appinfo.ini
LAUNCHER_INI = $(LAUNCHER_DIR)\$(PROGRAM_PORTABLE).ini
-WSMANIFEST = ../wireshark.manifest
-
-NSIS_PLUGINS = nsis-plugins
-FINDPROCDLL = $(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)\FindProcDLL.dll
-
COPY = xcopy
MKDIR = mkdir
COPY_FLAGS = /d /y
@@ -31,8 +26,6 @@ COPY_FLAGS = /d /y
WIN32_SETUP_OPT = --download
!ENDIF
-NSIS_DIR = $(TOPDIR)\packaging\nsis
-
# XXX This should be defined in config.nmake.
!IF EXIST("$(TOPDIR)\wireshark-qt-release\wireshark.exe")
QT_DIR = "$(TOPDIR)\wireshark-qt-release"
@@ -47,7 +40,7 @@ NEED_QT4_DLL = USE
UPX_FLAGS = -q
PAPPS_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).0
-PAPPS_PACKAGE=$(PROGRAM_PORTABLE)-$(VERSION).paf.exe
+PAPPS_PACKAGE=$(PROGRAM_PORTABLE)_$(VERSION).paf.exe
all: package
@@ -77,8 +70,8 @@ dirs:
#!ENDIF
$(APPINFO_INI): dirs appinfo.tmpl $(TOPDIR)\config.nmake
- sed -e 's/$$(PAPPS_VERSION)/$(PAPPS_VERSION)/g' \
- -e 's/$$(VERSION)/$(VERSION)/g' \
+ sed -e 's/@PORTABLEAPPS_PACKAGE_VERSION@/$(PAPPS_VERSION)/g' \
+ -e 's/@VERSION@/$(VERSION)/g' \
< appinfo.tmpl > $@
$(LAUNCHER_INI): dirs $(PROGRAM_PORTABLE).ini