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/fe-gtk/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fe-gtk/Makefile.am') diff --git a/src/fe-gtk/Makefile.am b/src/fe-gtk/Makefile.am index bd00db74..269eaa55 100644 --- a/src/fe-gtk/Makefile.am +++ b/src/fe-gtk/Makefile.am @@ -45,7 +45,7 @@ hexchat_SOURCES = ascii.c banlist.c chanlist.c chanview.c custom-list.c \ maingui.c notifygui.c $(notify_c) palette.c pixmaps.c plugin-tray.c $(plugingui_c) \ plugin-notification.c rawlog.c servlistgui.c setup.c $(iso_codes_c) \ sexy-spell-entry.c textgui.c urlgrab.c userlistgui.c xtext.c -hexchat_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/common +hexchat_CPPFLAGS = -I$(top_builddir)/src/common $(AM_CPPFLAGS) resources_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/data --generate-dependencies $(top_srcdir)/data/hexchat.gresource.xml) -- cgit 1.4.1