diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-06-30 21:37:34 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-07-01 07:16:37 +0000 |
| commit | b107e93c88fa6588c06f5e4bd3a4dd56b071e417 (patch) | |
| tree | 94bdbe1cbe918ddf393f7098db2ce7749fd800e4 | |
| parent | b0b027d1473cdda73a1592557179282ae656060b (diff) | |
| download | wireshark-b107e93c88fa6588c06f5e4bd3a4dd56b071e417.tar.gz | |
Don't assume the source directory's path has no spaces in it.
Have SOURCES_TAP just contain the file names of the taps to run through
make-tap-reg.py, and pass $$PWD, properly quoted, as the "source directory"
argument to make-tap-reg.py.
Change-Id: I09382ccf9931db636aaeeb5d94c0ae029453ea9d
Reviewed-on: https://code.wireshark.org/review/9432
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | ui/qt/Wireshark.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/Wireshark.pro b/ui/qt/Wireshark.pro index b37f896f4a..92e3ae19eb 100644 --- a/ui/qt/Wireshark.pro +++ b/ui/qt/Wireshark.pro @@ -158,16 +158,16 @@ win32 { } SOURCES_TAP = \ - "$$PWD/stats_tree_dialog.cpp" + "stats_tree_dialog.cpp" tap_register.name = Generate wireshark-tap-register.c tap_register.input = SOURCES_TAP tap_register.output = wireshark-tap-register.c tap_register.variable_out = SOURCES win32 { - tap_register.commands = $${PYTHON} "../../tools/make-tap-reg.py" . taps $$SOURCES_TAP + tap_register.commands = $${PYTHON} "../../tools/make-tap-reg.py" "\"""$$PWD""\"" taps $$SOURCES_TAP } else { - tap_register.commands = python ../../tools/make-tap-reg.py . taps $$SOURCES_TAP + tap_register.commands = python ../../tools/make-tap-reg.py "\"""$$PWD""\"" taps $$SOURCES_TAP } #tap_register.CONFIG += no_link QMAKE_EXTRA_COMPILERS += tap_register |