1 files changed, 24 insertions, 26 deletions
diff --git a/packaging/nsis/config.nsh.in b/packaging/nsis/config.nsh.in
index 349b558e46..211c667982 100644
--- a/packaging/nsis/config.nsh.in
+++ b/packaging/nsis/config.nsh.in
@@ -5,29 +5,27 @@
 # Do not prefix comments with ";". They will be removed by CMake.
 
 # MUST match "<Product ... Name=" in wix/Wireshark.wxs.
-!define PROGRAM_NAME "@PROGRAM_NAME@"
-!define TOP_SRC_DIR "@TOP_SRC_DIR@"
-!define STAGING_DIR "@STAGING_DIR@"
-!define WIRESHARK_TARGET_PLATFORM @WIRESHARK_TARGET_PLATFORM@
-!define TARGET_MACHINE @TARGET_MACHINE@
-!define WIRESHARK_LIB_DIR "@WIRESHARK_LIB_DIR@"
-!define NPCAP_PACKAGE_VERSION @NPCAP_PACKAGE_VERSION@
-!define USBPCAP_PACKAGE_VERSION @USBPCAP_PACKAGE_VERSION@
-!define VERSION @VERSION@
-!define VERSION_MAJOR @VERSION_MAJOR@
-!define VERSION_MINOR @VERSION_MINOR@
-# CMake treats 0 as "false" and will undef zero values
-!ifndef VERSION_MINOR
-!define VERSION_MINOR 0
-!endif
-!define PRODUCT_VERSION @PRODUCT_VERSION@
-
-!define MMDBRESOLVE_EXE @MMDBRESOLVE_EXE@
-
-!define VCREDIST_EXE "@VCREDIST_EXE@"
-
-!define USER_GUIDE_DIR "@USER_GUIDE_DIR@"
-
-!define SMI_DIR "@SMI_DIR@"
-
-!define QT_DIR "@QT_DIR@"
+#define PROGRAM_NAME "@PROGRAM_NAME@"
+#define TOP_SRC_DIR "@TOP_SRC_DIR@"
+#define STAGING_DIR "@STAGING_DIR@"
+#define WIRESHARK_TARGET_PLATFORM @WIRESHARK_TARGET_PLATFORM@
+#define TARGET_MACHINE @TARGET_MACHINE@
+#define WIRESHARK_LIB_DIR "@WIRESHARK_LIB_DIR@"
+#define NPCAP_PACKAGE_VERSION @NPCAP_PACKAGE_VERSION@
+#define USBPCAP_PACKAGE_VERSION @USBPCAP_PACKAGE_VERSION@
+#define VERSION @VERSION@
+#define VERSION_MAJOR @VERSION_MAJOR@
+#define VERSION_MINOR @VERSION_MINOR@
+#define PRODUCT_VERSION @PRODUCT_VERSION@
+
+#define VCREDIST_EXE "@VCREDIST_EXE@"
+
+# Optional components
+
+#cmakedefine MMDBRESOLVE_EXE @MMDBRESOLVE_EXE@
+
+#cmakedefine USER_GUIDE_DIR "@USER_GUIDE_DIR@"
+
+#cmakedefine SMI_DIR "@SMI_DIR@"
+
+#cmakedefine QT_DIR "@QT_DIR@"