diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-02-20 13:13:35 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-02-21 07:45:55 +0000 |
| commit | 8b46cbbceb51f86ccc2efb487cf66024b9174ab4 (patch) | |
| tree | cfb471ac5a22cf85804251b7b3139dd281253162 /wsutil | |
| parent | e282c19520802b6c1d61e29fa6dd72a8a991608c (diff) | |
autotools: Cleanup some installation directory stuff
Replace hacky code to set install dirs in config.h and use path definitions
only where required.
Change-Id: I78735f730725382c1b3aca876705e5e6e1872d78
Reviewed-on: https://code.wireshark.org/review/14033
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index e7b0813093..f718f42d5e 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -23,7 +23,11 @@ include $(top_srcdir)/Makefile.am.inc ACLOCAL_AMFLAGS = `../aclocal-flags` -AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) -DWS_BUILD_DLL +AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) -DWS_BUILD_DLL \ + -DTOP_SRCDIR=\"$(abs_top_srcdir)\" \ + -DDATAFILE_DIR=\"$(pkgdatadir)\" \ + -DEXTCAP_DIR=\"$(extcapdir)\" \ + -DPLUGIN_INSTALL_DIR=\"$(plugindir)\" # Optional headers for ABI checking wsutil_optional_abi_includes = |