From c79ce843f495b913ddafa383e6cf818ac99b4f15 Mon Sep 17 00:00:00 2001 From: Rainer Müller Date: Tue, 27 Sep 2016 00:29:33 +0200 Subject: build: Reorder includes to avoid installed plugin header When hexchat is already installed into a non-default prefix, a new build could pick up ${prefix}/include/hexchat-plugin.h from the installed version instead of the local header, as configuration variables such as $(GLIB_CFLAGS) would point to -I${prefix}/include. Reordering the includes and moving -I arguments to CPPFLAGS prevents this, as it ensures the local directories are always searched first. This was no problem when compiling for /usr or /usr/local as these directories in the compiler search path are always searched last. Closes #1822 --- src/common/dbus/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/dbus') diff --git a/src/common/dbus/Makefile.am b/src/common/dbus/Makefile.am index 11b5d77d..4cbbac24 100644 --- a/src/common/dbus/Makefile.am +++ b/src/common/dbus/Makefile.am @@ -15,7 +15,7 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) -AM_CPPFLAGS = $(COMMON_CFLAGS) $(DBUS_CFLAGS) -I$(top_srcdir)/src/common +AM_CPPFLAGS = -I$(top_srcdir)/src/common $(COMMON_CFLAGS) $(DBUS_CFLAGS) noinst_PROGRAMS = example example_SOURCES = example.c -- cgit 1.4.1