Author: Laszlo Kajan <lkajan@rostlab.org>
Description: respect CFLAGS and alike from environment
 CFLAGS CPPFLAGS LDFLAGS, to allow hardening flags to be passed from
 environment.
Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-September/017323.html
Forwarded-Comment: Upstream was bcc'd on forwarded email.
--- a/scripts/Makefile.apps
+++ b/scripts/Makefile.apps
@@ -42,7 +42,7 @@
 BASE_LDFLAGS=$(USER_LDFLAGS) -L$(LIB_DIR)
 DEBUG_LDFLAGS=$(BASE_LDFLAGS) -g
 OPT_LDFLAGS=$(BASE_LDFLAGS) -O 
-LDFLAGS=$(DEBUG_LDFLAGS)
+LDFLAGS:=$(DEBUG_LDFLAGS) $(LDFLAGS)
 
 
 #
@@ -67,10 +67,10 @@
 #
 
 opt:
-	    $(MAKE) $(EXE) "CFLAGS=$(OPT_CFLAGS)" "LDFLAGS=$(OPT_LDFLAGS)"
+	    $(MAKE) $(EXE) "CFLAGS=$(OPT_CFLAGS) $(CFLAGS)" "LDFLAGS=$(OPT_LDFLAGS) $(LDFLAGS)"
 
 debug:
-	    $(MAKE) $(EXE) "CFLAGS=$(DEBUG_CFLAGS)" "LDFLAGS=$(DEBUG_LDFLAGS)"
+	    $(MAKE) $(EXE) "CFLAGS=$(DEBUG_CFLAGS) $(CFLAGS)" "LDFLAGS=$(DEBUG_LDFLAGS) $(LDFLAGS)"
 
 $(EXE):	    $(OBJS) $(LIBDIR)
 	    mkdir -p $(EXE_DIR)
--- a/scripts/Makefile.pkgs
+++ b/scripts/Makefile.pkgs
@@ -39,10 +39,10 @@
 #
 
 opt:
-	    $(MAKE) $(LIB) "CFLAGS=$(OPT_CFLAGS)" 
+	    $(MAKE) $(LIB) "CFLAGS=$(OPT_CFLAGS) $(CFLAGS)"
 
 debug:
-	    $(MAKE) $(LIB) "CFLAGS=$(DEBUG_CFLAGS)" 
+	    $(MAKE) $(LIB) "CFLAGS=$(DEBUG_CFLAGS) $(CFLAGS)"
 
 $(LIB):     $(CCSRCS) $(CSRCS) $(OSRCS) $(OBJS) 
 	    mkdir -p $(LIB_DIR)
--- a/scripts/Makefile.std
+++ b/scripts/Makefile.std
@@ -21,7 +21,7 @@
 BASE_CFLAGS=$(USER_CFLAGS) -Wall -I. -I../../pkgs 
 DEBUG_CFLAGS=$(BASE_CFLAGS) -g
 OPT_CFLAGS=$(BASE_CFLAGS) -O3 -DNDEBUG
-CFLAGS=$(DEBUG_CFLAGS)
+CFLAGS:=$(DEBUG_CFLAGS) $(CFLAGS)
 
 
 
@@ -52,8 +52,8 @@
 .SUFFIXES: .c .C .o
 
 .C.o:
-	$(CC) $(CFLAGS) -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 
 .c.o:
-	gcc $(CFLAGS) -c $<
+	gcc $(CPPFLAGS) $(CFLAGS) -c $<
 
--- a/scripts/MSVC/Makefile.apps
+++ b/scripts/MSVC/Makefile.apps
@@ -39,7 +39,7 @@
 BASE_LDFLAGS=$(USER_LDFLAGS) /link /libpath:$(LIB_DIR)
 DEBUG_LDFLAGS=$(BASE_LDFLAGS) -Zi
 OPT_LDFLAGS=$(BASE_LDFLAGS) -Ox 
-LDFLAGS=$(DEBUG_LDFLAGS)
+LDFLAGS:=$(DEBUG_LDFLAGS) $(LDFLAGS)
 
 
 
@@ -58,10 +58,10 @@
 #
 
 opt:
-	    $(MAKE) $(EXE) "CFLAGS=$(OPT_CFLAGS)" "LDFLAGS=$(OPT_LDFLAGS)"
+	    $(MAKE) $(EXE) "CFLAGS=$(OPT_CFLAGS) $(CFLAGS)" "LDFLAGS=$(OPT_LDFLAGS) $(LDFLAGS)"
 
 debug:
-	    $(MAKE) $(EXE) "CFLAGS=$(DEBUG_CFLAGS)" "LDFLAGS=$(DEBUG_LDFLAGS)"
+	    $(MAKE) $(EXE) "CFLAGS=$(DEBUG_CFLAGS) $(CFLAGS)" "LDFLAGS=$(DEBUG_LDFLAGS) $(LDFLAGS)"
 
 $(EXE):	    $(OBJS) $(LIBDIR)
 	    mkdir -p $(EXE_DIR)
--- a/scripts/MSVC/Makefile.pkgs
+++ b/scripts/MSVC/Makefile.pkgs
@@ -39,10 +39,10 @@
 #
 
 opt:
-	    $(MAKE) $(LIB) "CFLAGS=$(OPT_CFLAGS)"
+	    $(MAKE) $(LIB) "CFLAGS=$(OPT_CFLAGS) $(CFLAGS)"
 
 debug:
-	    $(MAKE) $(LIB) "CFLAGS=$(DEBUG_CFLAGS)" 
+	    $(MAKE) $(LIB) "CFLAGS=$(DEBUG_CFLAGS) $(CFLAGS)"
 
 $(LIB):     $(CCSRCS) $(CSRCS) $(OSRCS) $(OBJS) 
 	    mkdir -p $(LIB_DIR)
--- a/scripts/MSVC/Makefile.std
+++ b/scripts/MSVC/Makefile.std
@@ -21,7 +21,7 @@
 BASE_CFLAGS=$(USER_CFLAGS) /TP /W3 -I. -I../../pkgs 
 DEBUG_CFLAGS=-Zi $(BASE_CFLAGS)
 OPT_CFLAGS=-Ox -DNDEBUG $(BASE_CFLAGS)
-CFLAGS=$(DEBUG_CFLAGS)
+CFLAGS:=$(DEBUG_CFLAGS) $(CFLAGS)
 
 
 
@@ -42,9 +42,9 @@
 .SUFFIXES: .c .C .obj
 
 .C.obj:
-	$(CC) $(CFLAGS) -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 
 .c.obj:
-	$(CC) $(CFLAGS) -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 
 
