diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-05-04 11:45:10 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-05-04 19:14:34 +0000 |
| commit | 8db1616ec382ca8eca3c6059fdfa32378a7918fb (patch) | |
| tree | 2334e518f986dfcb11c1c05832ecf703a934be82 /wsutil/filesystem.c | |
| parent | ec5af355d33ac6299eae2406036e3adcae267b20 (diff) | |
Get rid of more autotoolsisms.
Change-Id: I124732adf3c3da511c206932544b4d533404cfc5
Reviewed-on: https://code.wireshark.org/review/27332
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil/filesystem.c')
| -rw-r--r-- | wsutil/filesystem.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c index 5bb03bc3f4..e76e285414 100644 --- a/wsutil/filesystem.c +++ b/wsutil/filesystem.c @@ -844,23 +844,10 @@ get_datafile_dir(void) * if we're started with special privileges, so we need * only check it; we don't need to call started_with_special_privs().) * - * Use the top-level source directory as the datafile directory - * because most of our data files (radius/, COPYING) are there. - */ -#ifdef TOP_SRCDIR - /* - * When TOP_SRCDIR is defined, assume autotools where files are not - * copied to the build directory. This fallback location is relied on by - * wslua_get_actual_filename(). - */ - datafile_dir = TOP_SRCDIR; -#else - /* - * Otherwise assume CMake. Here, data files (console.lua, radius/, etc.) - * are copied to the build directory during the build. + * Data files (console.lua, radius/, etc.) are copied to the build + * directory during the build. */ datafile_dir = BUILD_TIME_DATAFILE_DIR; -#endif return datafile_dir; } else { if (g_getenv("WIRESHARK_DATA_DIR") && !started_with_special_privs()) { |