File ipv6calc-make.diff of Package ipv6calc

Index: ipv6calc-0.99.1/ipv6calc/Makefile.in
===================================================================
--- ipv6calc-0.99.1.orig/ipv6calc/Makefile.in
+++ ipv6calc-0.99.1/ipv6calc/Makefile.in
@@ -11,9 +11,10 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 
 # Compiler and Linker Options
-DEFAULT_CFLAGS ?= -O2 -Wall -g @CFLAGS_EXTRA@
+RPM_OPT_FLAGS = -O2 -Wall -g
+DEFAULT_CFLAGS ?= $(RPM_OPT_FLAGS) @CFLAGS_EXTRA@
 
 INCLUDES= @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE_L1@ @GEOIP_INCLUDE_L1@ -I../ -I../lib/ -I../databases/lib/
 
 LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB_L1@ @GEOIP_LIB_L1@ @DYNLOAD_LIB@
Index: ipv6calc-0.99.1/Makefile.in
===================================================================
--- ipv6calc-0.99.1.orig/Makefile.in
+++ ipv6calc-0.99.1/Makefile.in
@@ -7,9 +7,10 @@
 #  Main Makefile for ipv6calc project
 #
 
 # Compiler and Linker Options
-export DEFAULT_CFLAGS = -D_GNU_SOURCE -O2 -Wall -g @CFLAGS_EXTRA@
+RPM_OPT_FLAGS = -O2 -Wall -g
+export DEFAULT_CFLAGS = -D_GNU_SOURCE $(RPM_OPT_FLAGS) @CFLAGS_EXTRA@
 
 ifeq (@ENABLE_BUNDLED_GETOPT@, 1)
   GETOPT_MAKE = getopt-make
   GETOPT_DIR  = getopt
Index: ipv6calc-0.99.1/databases/lib/Makefile.in
===================================================================
--- ipv6calc-0.99.1.orig/databases/lib/Makefile.in
+++ ipv6calc-0.99.1/databases/lib/Makefile.in
@@ -10,9 +10,10 @@
 libdir	= @libdir@
 
 # Compiler and Linker Options
 #  -D__EXTENSIONS__ is for Solaris & strtok_r
-DEFAULT_CFLAGS ?= -O2 -Wall
+RPM_OPT_FLAGS = -O2 -Wall
+DEFAULT_CFLAGS ?= $(RPM_OPT_F:AGS)
 CFLAGS += -D__EXTENSIONS__ -fPIC
 
 INCLUDES= -I../../lib -I../.. @GEOIP_INCLUDE_L2@ @IP2LOCATION_INCLUDE_L2@
 
Index: ipv6calc-0.99.1/ipv6loganon/Makefile.in
===================================================================
--- ipv6calc-0.99.1.orig/ipv6loganon/Makefile.in
+++ ipv6calc-0.99.1/ipv6loganon/Makefile.in
@@ -12,9 +12,10 @@ exec_prefix     = @exec_prefix@
 bindir		= @bindir@
 
 # Compiler and Linker Options
 #  -D__EXTENSIONS__ is for Solaris & strtok_r
-DEFAULT_CFLAGS ?= -O2 -Wall -g @CFLAGS_EXTRA@
+RPM_OPT_FLAGS = -O2 -Wall -g
+DEFAULT_CFLAGS ?= $(RPM_OPT_FLAGS) @CFLAGS_EXTRA@
 CFLAGS += -D__EXTENSIONS__
 
 INCLUDES= $(COPTS) @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE_L1@ @GEOIP_INCLUDE_L1@ -I../ -I../lib/
 
Index: ipv6calc-0.99.1/ipv6logconv/Makefile.in
===================================================================
--- ipv6calc-0.99.1.orig/ipv6logconv/Makefile.in
+++ ipv6calc-0.99.1/ipv6logconv/Makefile.in
@@ -12,9 +12,10 @@ exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 
 # Compiler and Linker Options
 #  -D__EXTENSIONS__ is for Solaris & strtok_r
-DEFAULT_CFLAGS ?= -O2 -Wall -g @CFLAGS_EXTRA@
+RPM_OPT_FLAGS = -O2 -Wall -g
+DEFAULT_CFLAGS ?= $(RPM_OPT_FLAGS) @CFLAGS_EXTRA@
 CFLAGS += -D__EXTENSIONS__
 
 INCLUDES= @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE_L1@ @GEOIP_INCLUDE_L1@ -I../ -I../lib/ -I../databases/lib/
 
Index: ipv6calc-0.99.1/ipv6logstats/Makefile.in
===================================================================
--- ipv6calc-0.99.1.orig/ipv6logstats/Makefile.in
+++ ipv6calc-0.99.1/ipv6logstats/Makefile.in
@@ -12,9 +12,10 @@ exec_prefix     = @exec_prefix@
 bindir		= @bindir@
 
 # Compiler and Linker Options
 #  -D__EXTENSIONS__ is for Solaris & strtok_r
-DEFAULT_CFLAGS ?= -O2 -Wall -g @CFLAGS_EXTRA@
+RPM_OPT_FLAGS = -O2 -Wall -g
+DEFAULT_CFLAGS ?= $(RPM_OPT_FLAGS) @CFLAGS_EXTRA@
 CFLAGS += -D__EXTENSIONS__
 
 INCLUDES= $(COPTS) @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE_L1@ @GEOIP_INCLUDE_L1@ -I../ -I../lib/ -I../databases/lib/
 
Index: ipv6calc-0.99.1/tools/Makefile.in
===================================================================
--- ipv6calc-0.99.1.orig/tools/Makefile.in
+++ ipv6calc-0.99.1/tools/Makefile.in
@@ -13,9 +13,10 @@ datadir         = @datadir@
 datarootdir     = @datarootdir@
 
 
 # Compiler and Linker Options
-DEFAULT_CFLAGS ?= -O2 -Wall -g
+RPM_OPT_FLAGS = -O2 -Wall -g
+DEFAULT_CFLAGS ?= $(RPM_OPT_FLAGS)
 
 INCLUDES= -I../getopt/ -I../ -I../lib/
 
 GETOBJS = ../getopt/getopt.o ../getopt/getopt1.o
Index: ipv6calc-0.99.1/mod_ipv6calc/Makefile.in
===================================================================
--- ipv6calc-0.99.1.orig/mod_ipv6calc/Makefile.in
+++ ipv6calc-0.99.1/mod_ipv6calc/Makefile.in
@@ -11,9 +11,10 @@ SYSCONFDIR = @HTTPD_SYSCONFDIR@
 
 APXS	= @APXS@
 
 # Compiler and Linker Options
-DEFAULT_CFLAGS ?= -O2 -Wall -g @CFLAGS_EXTRA@
+RPM_OPT_FLAGS = -O2 -Wall -g
+DEFAULT_CFLAGS ?= $(RPM_OPT_FLAGS) @CFLAGS_EXTRA@
 
 INCLUDES= @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE_L1@ @GEOIP_INCLUDE_L1@ -I../ -I../lib/ -I../databases/lib/
 
 LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB_L1@ @GEOIP_LIB_L1@ -lm
Index: ipv6calc-0.99.1/lib/Makefile.in
===================================================================
--- ipv6calc-0.99.1.orig/lib/Makefile.in
+++ ipv6calc-0.99.1/lib/Makefile.in
@@ -10,9 +10,10 @@
 libdir	= @libdir@
 
 # Compiler and Linker Options
 #  -D__EXTENSIONS__ is for Solaris & strtok_r
-DEFAULT_CFLAGS ?= -O2 -Wall
+RPM_OPT_FLAGS = -O2 -Wall
+DEFAULT_CFLAGS ?= $(RPM_OPT_FLAGS)
 CFLAGS += -D__EXTENSIONS__ -fPIC
 
 INCLUDES= -I. -I../ -I../databases/lib/ @GETOPT_INCLUDE@ @MD5_INCLUDE@ @GEOIP_INCLUDE_L1@ @IP2LOCATION_INCLUDE_L1@