[patch] Patch 1 for files

0001-Ebuildify.patch (text/plain), 2.56 KB, created by Benjamin Bannier on 2008-03-04 05:47:22 UTC

From b1caf334b23e81f043af8fa63b3773b264f6575f Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <[e-mail]>
Date: Sun, 2 Mar 2008 00:04:04 -0500
Subject: [PATCH] Ebuildify

install
---
 Configure                    |    4 ++--
 config/scripts/install.sh.SH |    6 ------
 config/sys/Linux-g++.gmk     |    1 +
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Configure b/Configure
index c233600..b298c66 100755
--- a/Configure
+++ b/Configure
@@ -6145,7 +6145,7 @@ echo ""
 
 if  [ $g4_gmake = y ] ; then
 
-g4make=gmake
+g4make="gmake "`echo $MAKEOPTS`
 
 g4message=`cat << EOM
 
@@ -6159,7 +6159,7 @@ fi
 
 if [ $g4_gmake = n ] && [ $g4_make = y ] ; then
 
-g4make=make
+g4make="make "`echo $MAKEOPTS`
 
 g4message=`cat << EOM
 
diff --git a/config/scripts/install.sh.SH b/config/scripts/install.sh.SH
index f7223f3..584a57e 100755
--- a/config/scripts/install.sh.SH
+++ b/config/scripts/install.sh.SH
@@ -646,8 +646,6 @@ if [ X\$err2 = X0 -a X\$int2 = X0 ] ; then
 echo ""
 echo "####################################################"
 echo "# Your Geant4 installation seems to be successful!  "
-echo "# To be sure please have a look into the log file:  "
-echo "# $g4conf/g4make.log				  "
 echo "####################################################"
 echo ""
 else
@@ -655,8 +653,6 @@ echo ""
 echo "############################################################"
 echo "# It looks like you had errors during Geant4 installation   "
 echo "# (or interrupted installation)!				  "
-echo "# Please check log file:				      	  "
-echo "# $g4conf/g4make.log					  "
 echo "############################################################"
 echo ""
 fi 
@@ -665,8 +661,6 @@ echo ""
 echo "############################################################"
 echo "# It looks like you had errors during Geant4 installation   "
 echo "# (or interrupted installation)!				  "
-echo "# You have no log file:				      	  "
-echo "# $g4conf/g4make.log					  "
 echo "############################################################"
 echo ""
 fi
diff --git a/config/sys/Linux-g++.gmk b/config/sys/Linux-g++.gmk
index a23eff8..1c03a04 100644
--- a/config/sys/Linux-g++.gmk
+++ b/config/sys/Linux-g++.gmk
@@ -5,6 +5,7 @@ ifeq ($(G4SYSTEM),Linux-g++)
   CXX       := g++
   CXXFLAGS  := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
   CXXFLAGS  += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
+  CXXFLAGS  += $(shell echo $(CFLAGS))
 #
 # Uncomment the following options to activate Pentium4 chip specific
 # floating-point operations on the SSE unit. It will allow for more stable
-- 
1.5.4.3