[dcmf] [PATCH] Correct a mistake that adds uses a non-existant Make variable.

[Joe Ratterman]

The changes that allowed the system to build without bgp/scripts broke the standard build.  It made use of the ${FLOOR} variable which is not generated by bgp/scripts/configure.

Signed-off-by: Joe Ratterman <jratt at us.ibm.com>
---
 Make.rules.floor      |   27 ++++++++++++++-------------
 lib/ga/Makefile       |    2 +-
 lib/mpi/Makefile.dcmf |    2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Make.rules.floor b/Make.rules.floor
index 6846164..3375716 100644
--- a/Make.rules.floor
+++ b/Make.rules.floor
@@ -16,22 +16,23 @@ BUILD_ALIAS            = powerpc64-linux-gnu
 FLOOR                  = /bgsys/drivers/ppcfloor
 PREFIX_CROSS_GNU       = powerpc-bgp-linux-
 
-AR_CNK                 = ${FLOOR}/gnu-linux/bin/${PREFIX_CROSS_GNU}ar
-AR_LINUX               = ${FLOOR}/gnu-linux/bin/${PREFIX_CROSS_GNU}ar
-CXX_CNK                = ${FLOOR}/gnu-linux/bin/${PREFIX_CROSS_GNU}g++
-CXX_LINUX              = ${FLOOR}/gnu-linux/bin/${PREFIX_CROSS_GNU}g++
-CC_CNK                 = ${FLOOR}/gnu-linux/bin/${PREFIX_CROSS_GNU}gcc
-CC_LINUX               = ${FLOOR}/gnu-linux/bin/${PREFIX_CROSS_GNU}gcc
-F77_LINUX              = ${FLOOR}/gnu-linux/bin/${PREFIX_CROSS_GNU}gfortran
-LD_LINUX               = ${FLOOR}/gnu-linux/bin/${PREFIX_CROSS_GNU}ld
-RANLIB_LINUX           = ${FLOOR}/gnu-linux/bin/${PREFIX_CROSS_GNU}ranlib
+BGP_COMM_PATH          =${ROOTDIR}/install
+BGP_GNU_LINUX_PATH     =${FLOOR}/gnu-linux
+BGP_ARCH_PATH          =${FLOOR}/arch
+BGP_RUNTIME_PATH       =${FLOOR}/runtime
 
-BGP_COMM_PATH=${ROOTDIR}/install
-BGP_ARCH_PATH=${FLOOR}/arch
-BGP_RUNTIME_PATH=${FLOOR}/runtime
+AR_CNK                 = ${BGP_GNU_LINUX_PATH}/bin/${PREFIX_CROSS_GNU}ar
+AR_LINUX               = ${BGP_GNU_LINUX_PATH}/bin/${PREFIX_CROSS_GNU}ar
+CXX_CNK                = ${BGP_GNU_LINUX_PATH}/bin/${PREFIX_CROSS_GNU}g++
+CXX_LINUX              = ${BGP_GNU_LINUX_PATH}/bin/${PREFIX_CROSS_GNU}g++
+CC_CNK                 = ${BGP_GNU_LINUX_PATH}/bin/${PREFIX_CROSS_GNU}gcc
+CC_LINUX               = ${BGP_GNU_LINUX_PATH}/bin/${PREFIX_CROSS_GNU}gcc
+F77_LINUX              = ${BGP_GNU_LINUX_PATH}/bin/${PREFIX_CROSS_GNU}gfortran
+LD_LINUX               = ${BGP_GNU_LINUX_PATH}/bin/${PREFIX_CROSS_GNU}ld
+RANLIB_LINUX           = ${BGP_GNU_LINUX_PATH}/bin/${PREFIX_CROSS_GNU}ranlib
 
 # to remove:
-AS_LINUX               = ${FLOOR}/gnu-linux/bin/${PREFIX_CROSS_GNU}as
+AS_LINUX               = ${BGP_GNU_LINUX_PATH}/bin/${PREFIX_CROSS_GNU}as
 BGPINSTALL_DIR         = /bgusr/jratt/bgp.01/bgp/work
 CPU_FLAGS_CHIPVERSION  =
 MKDIR                  = mkdir
diff --git a/lib/ga/Makefile b/lib/ga/Makefile
index 4cedde0..dd1b3c9 100644
--- a/lib/ga/Makefile
+++ b/lib/ga/Makefile
@@ -30,7 +30,7 @@ ifeq (${PLATFORM},BGP)
 
     export ARMCIDRV         = ${BGPINSTALL_DIR}
     export BGDRIVER         = ${ARMCIDRV}
-    export BGCOMPILERS      = ${FLOOR}/gnu-linux/bin/
+    export BGCOMPILERS      = ${BGP_GNU_LINUX_PATH}/bin/
 
     export ARMCI_NETWORK    = DCMFMPI
     export MSG_COMMS        = DCMFMPI
diff --git a/lib/mpi/Makefile.dcmf b/lib/mpi/Makefile.dcmf
index 6640394..36d1db9 100644
--- a/lib/mpi/Makefile.dcmf
+++ b/lib/mpi/Makefile.dcmf
@@ -50,7 +50,7 @@ ifeq (${PLATFORM},BGP)
     MPICH2NATIVE_INSTALL = ${MPICH2NATIVE}-install
 
     # ---------------- default compilation targets -----------------------------
-    HOST_GCC_BIN         =${FLOOR}/gnu-linux/bin
+    HOST_GCC_BIN         =${BGP_GNU_LINUX_PATH}/bin
     HOST_GCC             =${CC_LINUX}
     HOST_CC              =${CC_LINUX}
     HOST_CXX             =${CXX_LINUX}
-- 
1.5.4