diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-01-07 22:36:01 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-01-07 22:36:01 +0000 |
| commit | 644d6fe8ea8411bea48648377b75f0b45857b206 (patch) | |
| tree | 87124b2f516ba45edae1c7a512d7fb6f4684e1c7 | |
| parent | abda30e9e6d8fd9aa28edc4677796e61a9c88997 (diff) | |
| download | wireshark-644d6fe8ea8411bea48648377b75f0b45857b206.tar.gz wireshark-644d6fe8ea8411bea48648377b75f0b45857b206.tar.bz2 wireshark-644d6fe8ea8411bea48648377b75f0b45857b206.zip | |
Fix warning when use make packaging on Windows
warning: unknown variable/constant "{PROGRAM_NAME_PATH_GTK}" detected, ignoring (macro:MUI_FUNCTION_FINISHPAGE:387)
svn path=/trunk/; revision=54634
| -rwxr-xr-x | packaging/nsis/common.nsh | 4 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/packaging/nsis/common.nsh b/packaging/nsis/common.nsh index e6f68bd9d7..ef85faa498 100755 --- a/packaging/nsis/common.nsh +++ b/packaging/nsis/common.nsh @@ -14,6 +14,10 @@ Name "${DISPLAY_NAME}" !define PROGRAM_NAME_GTK "${PROGRAM_NAME} (GTK+)" !define PROGRAM_NAME_QT "${PROGRAM_NAME} (Qt)" +!define PROGRAM_FULL_NAME_GTK "The ${PROGRAM_NAME} Network Protocol Analyzer (GTK+)" +!define PROGRAM_FULL_NAME_QT "The ${PROGRAM_NAME} Network Protocol Analyzer (Qt)" +!define PROGRAM_NAME_PATH_GTK "${PROGRAM_NAME}.exe" +!define PROGRAM_NAME_PATH_QT "qtshark.exe" !define UNINSTALLER_NAME "uninstall.exe" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 3a352ff589..9e4e1e81f3 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -274,11 +274,6 @@ Var WINPCAP_UNINSTALL ;declare variable for holding the value of a registry key Var VCREDIST_FLAGS ; silent vs passive, norestart !endif -!define PROGRAM_FULL_NAME_GTK "The ${PROGRAM_NAME} Network Protocol Analyzer (GTK+)" -!define PROGRAM_FULL_NAME_QT "The ${PROGRAM_NAME} Network Protocol Analyzer (Qt)" -!define PROGRAM_NAME_PATH_GTK "${PROGRAM_NAME}.exe" -!define PROGRAM_NAME_PATH_QT "qtshark.exe" - Section "-Required" ;------------------------------------------- |