[Rivet-svn] rivet: Finesse the verbose flag passing to the temporary Makefil...

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/43efe1231e3a
branches:  
changeset: 5851:43efe1231e3a
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jun 19 20:21:06 2017 +0100
description:
Finesse the verbose flag passing to the temporary Makefiles, and try to instruct the 'official' plugin building to use the source/build dir sources & libs rather than the (maybe-)installed ones

diffs (truncated from 91 to 50 lines):

--- a/bin/rivet-buildplugin.in	Mon Jun 19 16:40:13 2017 +0200
+++ b/bin/rivet-buildplugin.in	Mon Jun 19 20:21:06 2017 +0100
@@ -157,15 +157,16 @@
 fi
 
 ## Get Rivet system C preprocessor flags (duplicating that in rivet-config.in)
-irivet="@includedir@"
+if [[ -n "$RIVET_BUILDPLUGIN_BEFORE_INSTALL" ]]; then
+    irivet="@top_srcdir@/include"
+else
+    irivet="@includedir@"
+fi
 test -n "$irivet" && mycppflags="$mycppflags -I${irivet}"
-
 ihepmc="@HEPMCINCPATH@"
 test -n "$ihepmc" && mycppflags="$mycppflags -I${ihepmc}"
-
 iyoda="@YODAINCPATH@"
 test -n "$iyoda" && mycppflags="$mycppflags -I${iyoda}"
-
 ifastjet="@FASTJETINCPATH@"
 test -n "$ifastjet" && mycppflags="$mycppflags -I${ifastjet}"
 # igsl="@GSLINCPATH@"
@@ -175,7 +176,11 @@
 
 ## Get Rivet system linker flags (duplicating that in rivet-config.in)
 myldflags=""
-lrivet="@libdir@"
+if [[ -n "$RIVET_BUILDPLUGIN_BEFORE_INSTALL" ]]; then
+    lrivet="@top_builddir@/src/.libs"
+else
+    lrivet="@libdir@"
+fi
 test -n "$lrivet" && myldflags="$myldflags -L${lrivet}"
 lhepmc="@HEPMCLIBPATH@"
 test -n "$lhepmc" && myldflags="$myldflags -L${lhepmc}"
@@ -242,24 +247,26 @@
 done
 objnames=("${srcnames[@]/.cc/.o}")
 
-if [[ -n "$debug" ]]; then x="@"; fi
+if [[ -z "$debug" ]]; then silencer="@"; fi
 tmpmakefile=$(mktemp Makefile.tmp.XXXXXXXXXX)
 cat > "$tmpmakefile" <<EOF
-CXX = $mycxx
+RCXX = $mycxx
 
-CXXFLAGS = $shared_flags $mycxxflags $rootcxxflags
+RCXXFLAGS = $shared_flags $mycxxflags $rootcxxflags