From 8b46cbbceb51f86ccc2efb487cf66024b9174ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sat, 20 Feb 2016 13:13:35 +0000 Subject: autotools: Cleanup some installation directory stuff MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- wsutil/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'wsutil') 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 = -- cgit v1.2.3