From 8edc6e9755715fc73729e24ecd852859acdea16d Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Thu, 5 Dec 2013 09:48:31 +0100
Subject: [PATCH] Fix in case Pythia8 headers are in /usr/include. Fixes
 ROOT-5812.

---
 config/Makefile.in           | 2 +-
 montecarlo/pythia8/Module.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/Makefile.in b/config/Makefile.in
index f32b3d1310a..6de99c6e930 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -257,7 +257,7 @@ FPYTHIA6LIB      := @pythia6lib@
 FPYTHIA6CPPFLAGS := @pythia6cppflags@
 
 BUILDFPYTHIA8    := @buildpythia8@
-FPYTHIA8INCDIR   := @pythia8incdir@
+FPYTHIA8INCDIR   := $(filter-out /usr/include, @pythia8incdir@)
 FPYTHIA8LIBDIR   := @pythia8libdir@
 FPYTHIA8LIB      := @pythia8lib@
 
diff --git a/montecarlo/pythia8/Module.mk b/montecarlo/pythia8/Module.mk
index e815b993f80..a4cc1736230 100644
--- a/montecarlo/pythia8/Module.mk
+++ b/montecarlo/pythia8/Module.mk
@@ -53,7 +53,7 @@ $(call pcmrule,PYTHIA8)
 $(PYTHIA8DS):   $(PYTHIA8H) $(PYTHIA8L) $(ROOTCINTTMPDEP) $(call pcmdep,PYTHIA8)
 		$(MAKEDIR)
 		@echo "Generating dictionary $@..."
-		$(ROOTCINTTMP) -f $@ $(call dictModule,PYTHIA8) -c -I$(FPYTHIA8INCDIR) $(PYTHIA8H) $(PYTHIA8L)
+		$(ROOTCINTTMP) -f $@ $(call dictModule,PYTHIA8) -c $(FPYTHIA8INCDIR:%=-I%) $(PYTHIA8H) $(PYTHIA8L)
 
 $(PYTHIA8MAP):  $(RLIBMAP) $(MAKEFILEDEP) $(PYTHIA8L)
 		$(RLIBMAP) -o $@ -l $(PYTHIA8LIB) \
-- 
GitLab