diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-01-06 12:19:04 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-01-06 20:41:09 +0000 |
| commit | a6e6deea7feeaa1d6c8b5084d4baebdd24138c46 (patch) | |
| tree | 15e438bbb63341e2e385029f1a4df56fd565d856 /packaging/nsis/config.nsh.in | |
| parent | f39366bb1297c1b932459a6ad991869b22336176 (diff) | |
NSIS: Quote all paths in config.nsh.
Fix the MAKEDIR substitution. Add config.nsh to .gitignore.
Change-Id: I9c5f6469569e826e4a8036b9b1b483c16558f788
Reviewed-on: https://code.wireshark.org/review/6351
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/nsis/config.nsh.in')
| -rw-r--r-- | packaging/nsis/config.nsh.in | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/packaging/nsis/config.nsh.in b/packaging/nsis/config.nsh.in index 0a5ea99359..d51c19c4ce 100644 --- a/packaging/nsis/config.nsh.in +++ b/packaging/nsis/config.nsh.in @@ -25,18 +25,17 @@ !define WTAP_VERSION @WTAP_VERSION@ !define MSVCR_DLL "@MSVCR_DLL@" - !define VCREDIST_EXE "@VCREDIST_EXE@" !define ENABLE_LIBWIRESHARK @ENABLE_LIBWIRESHARK@ ; Qt -!define QT_DIR @QT_DIR@ +!define QT_DIR "@QT_DIR@" ; GTK+ -!define GTK_DIR @GTK_DIR@ -!define GTK_LIB_DIR @GTK_LIB_DIR@ -!define PANGO_LIB_DIR @PANGO_LIB_DIR@ +!define GTK_DIR "@GTK_DIR@" +!define GTK_LIB_DIR "@GTK_LIB_DIR@" +!define PANGO_LIB_DIR "@PANGO_LIB_DIR@" !define GDK_DLL @GDK_DLL@ !define GTK_DLL @GTK_DLL@ !define GTK_NAME @GTK_NAME@ |