[Rivet-svn] r1914 - trunk/src/Tools

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Oct 15 18:13:14 2009
New Revision: 1914

Log:
yaml-cpp fixes: reinstate Frank's workaround for SL4 automake bug, and use installed yaml-cpp libdir to link against if found, rather than always falling back to the prefix

Modified:
   trunk/src/Tools/Makefile.am

Modified: trunk/src/Tools/Makefile.am
==============================================================================
--- trunk/src/Tools/Makefile.am	Thu Oct 15 18:12:02 2009	(r1913)
+++ trunk/src/Tools/Makefile.am	Thu Oct 15 18:13:14 2009	(r1914)
@@ -25,9 +25,10 @@
   -DDEFAULTDATADIR=\"$(datadir)\" \
   -DDEFAULTLIBDIR=\"$(libdir)\"
 
+## NB. Using $(top_builddir)/src/Tools rather than $(builddir) because of SL4 automake bug
 if WITH_YAML_CPP
-libRivetTools_la_LDFLAGS = $(AM_LDFLAGS) -L$(builddir)/yaml-cpp
+libRivetTools_la_LDFLAGS = $(AM_LDFLAGS) -L$(YAML_CPPLIBPATH)
 libRivetTools_la_LIBADD = -lyaml-cpp
 else
-libRivetTools_la_LIBADD = $(builddir)/yaml-cpp/libyaml-cpp.la
+libRivetTools_la_LIBADD = $(top_builddir)/src/Tools/yaml-cpp/libyaml-cpp.la
 endif