aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2015-10-08 07:29:25 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2015-10-08 05:31:10 +0000
commit29b87a368ac241e582ad46a7b5185937efc3e0ad (patch)
tree25daea49a98ef9d8fe277e41df71a4f194abfe6d /packaging
parent7d252d4b55e06d577f56f2169a757e81276dba7b (diff)
Add USBPcapPage.ini file to distribution
Change-Id: I05ed2c561818fd4293543199063551dd65fb5c55 Reviewed-on: https://code.wireshark.org/review/10871 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/CMakeLists.txt1
-rw-r--r--packaging/nsis/Makefile.am1
-rw-r--r--packaging/nsis/Makefile.nmake3
3 files changed, 4 insertions, 1 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt
index 4852f43a55..cdba262d88 100644
--- a/packaging/nsis/CMakeLists.txt
+++ b/packaging/nsis/CMakeLists.txt
@@ -38,6 +38,7 @@ set(NSIS_FILES
servicelib.nsh
AdditionalTasksPage.ini
WinPcapPage.ini
+ USBPcapPage.ini
${NSIS_GENERATED_FILES}
PARENT_SCOPE
)
diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am
index 191ea10244..6551fd9c03 100644
--- a/packaging/nsis/Makefile.am
+++ b/packaging/nsis/Makefile.am
@@ -17,5 +17,6 @@ EXTRA_DIST = \
VersionCompare.nsh \
windeployqt-to-nsis.ps1 \
WinPcapPage.ini \
+ USBPcapPage.ini \
wireshark.nsi \
x64.nsh
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index ae0f66c7e4..0890b02af7 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -68,7 +68,8 @@ NSI=\
GetWindowsVersion.nsh \
servicelib.nsh \
AdditionalTasksPage.ini \
- WinPcapPage.ini
+ WinPcapPage.ini \
+ USBPcapPage.ini
UNINSTALL_INSTALLER = $(STAGING_DIR)\uninstall_installer.exe