osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

wsutil: Rename DATAFILE_DIR variable 

Rename DATAFILE_DIR to be closer to CMake and avoid mixing
with the staging dir path variable of the same name.

Change-Id: I7b1e02152d8bde14cca210fbfae4acbdba7d78d7
Reviewed-on: https://code.wireshark.org/review/30916
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2018-12-04 01:46:01 +00:00 committed by João Valverde
parent 011ca1ed9b
commit 6a8168169a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wsutil/CMakeLists.txt
View File

@ -11,7 +11,7 @@ include(UseABICheck)
add_definitions(-DPLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_LIBDIR}\")
add_definitions(-DEXTCAP_DIR=\"${CMAKE_INSTALL_PREFIX}/${EXTCAP_INSTALL_LIBDIR}\")
add_definitions(-DDATAFILE_DIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}\")
add_definitions(-DDATA_DIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}\")
set(WSUTIL_PUBLIC_HEADERS
adler32.h

6
wsutil/filesystem.c
View File

@ -586,7 +586,7 @@ init_progfile_dir(const char *arg0
if (getcwd(curdir, path_max) == NULL) {
/*
* It failed - give up, and just stick
* with DATAFILE_DIR.
* with DATA_DIR.
*/
g_free(curdir);
return g_strdup_printf("getcwd failed: %s\n",
@ -771,7 +771,7 @@ get_progfile_dir(void)
*
* Otherwise, if the program was executed from the build directory, use the
* directory in which the executable for this process resides. In all other
* cases, use the DATAFILE_DIR value that was set at compile time.
* cases, use the DATA_DIR value that was set at compile time.
*
* XXX - if we ever make libwireshark a real library, used by multiple
* applications (more than just TShark and versions of Wireshark with
@ -864,7 +864,7 @@ get_datafile_dir(void)
*/
datafile_dir = g_strdup(progfile_dir);
} else {
datafile_dir = g_strdup(DATAFILE_DIR);
datafile_dir = g_strdup(DATA_DIR);
}
#endif