From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Fri, 29 Aug 2014 08:44:02 +0000 (+0200)
Subject: Fix !, respect existing LD_LIB_PATH (e.g. for finding libstdc++).
X-Git-Tag: v6-02-00-rc1~249
X-Git-Url: https://root.cern.ch/gitweb?p=root.git;a=commitdiff_plain;h=47592253e94d3157c3c0e6bc6799826b1b0af229

Fix !, respect existing LD_LIB_PATH (e.g. for finding libstdc++).
---

diff --git a/Makefile b/Makefile
index 86c104c..18ff635 100644
--- a/Makefile
+++ b/Makefile
@@ -1198,7 +1198,7 @@ install: all
 	   echo "Installing GDML conversion scripts in $(DESTDIR)$(LIBDIR)"; \
 	   $(INSTALLDATA) $(ROOT_SRCDIR)/geom/gdml/*.py $(DESTDIR)$(LIBDIR); \
 	   (cd $(DESTDIR)$(TUTDIR); \
-	      LD_LIBRARY_PATH=$(DESTDIR)$(LIBDIR) ! $(DESTDIR)$(BINDIR)/root -l -b -q -n -x hsimple.C); \
+	      LD_LIBRARY_PATH=$(DESTDIR)$(LIBDIR):$$LD_LIBRARY_PATH && ! $(DESTDIR)$(BINDIR)/root -l -b -q -n -x hsimple.C); \
 	fi
 
 uninstall: