let config.mak overwrite the default values (defensive coding style :-)

svn-id: r7715

Makefile.new

@@ -1,10 +1,8 @@
 # $Header$
 
-include config.mak
-
-# CXX     := c++
+CXX     := c++
 AR      := ar cru
-# RANLIB  := ranlib
+RANLIB  := ranlib
 RM      := rm -f
 MKDIR   := mkdir -p
 ECHO    := echo -n
@@ -23,9 +21,12 @@ CXXFLAGS:= -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-m
 DEFINES := -DHAVE_CONFIG_H
 LDFLAGS :=
 INCLUDES:= -I. -Icommon
-# LIBS	:=
+LIBS	:=
 OBJS	:=
 
+# Load the make rules generated by configure
+include config.mak
+
 # Load the build rules & settings for the chosen backend
 -include build.rules
 

configure

@@ -391,8 +391,8 @@ echo "Creating config.mak"
 cat > config.mak << EOF
 # -------- Generated by configure -----------
 
-CXX = $CXX
-LIBS = $LIBS
-RANLIB = $_ranlib
+CXX := $CXX
+LIBS := $LIBS
+RANLIB := $_ranlib
 
 EOF