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 --- plugins/perl/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/perl') diff --git a/plugins/perl/Makefile.am b/plugins/perl/Makefile.am index 83239672..af721e7e 100644 --- a/plugins/perl/Makefile.am +++ b/plugins/perl/Makefile.am @@ -8,7 +8,8 @@ lib_LTLIBRARIES = perl.la perl_la_SOURCES = perl.c perl_la_LDFLAGS = $(PERL_LDFLAGS) $(PLUGIN_LDFLAGS) -module perl_la_LIBADD = $(GLIB_LIBS) -perl_la_CFLAGS = $(PERL_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/src/common +perl_la_CPPFLAGS = -I$(top_srcdir)/src/common +perl_la_CFLAGS = $(PERL_CFLAGS) $(GLIB_CFLAGS) BUILT_SOURCES = hexchat.pm.h irc.pm.h CLEANFILES = $(BUILT_SOURCES) -- cgit 1.4.1