- pass CFLAGS and CC

Changed files:
    bdiff-Makefile.patch -> 1.2
    bdiff.spec -> 1.2

diff --git a/bdiff-Makefile.patch b/bdiff-Makefile.patch
index e4403687a626b9e3fb551218eda610f236bcede7..e3e45fb2475342ed0a68f67385cfc851e8b77aec 100644 (file)
--- a/bdiff-Makefile.patch
+++ b/bdiff-Makefile.patch
@@ -1,11 +1,27 @@
---- bdiff-1.0.4/Makefile~      2003-09-30 21:45:54.000000000 +0000
-+++ bdiff-1.0.4/Makefile       2004-03-08 16:37:32.413065664 +0000
-@@ -14,7 +14,7 @@
-       strip bdiff
+diff -burN bdiff-1.0.4.orig/Makefile bdiff-1.0.4/Makefile
+--- bdiff-1.0.4.orig/Makefile  2004-03-08 17:47:48.504405544 +0100
++++ bdiff-1.0.4/Makefile       2004-03-08 17:50:03.583870344 +0100
+@@ -2,19 +2,16 @@
+ # _LIBC define for md5.o is needed on bigendian machines
+ 
+ bdiff: bdiff.c lib/md5.o
+-      cc -O2 -Wall -Wno-parentheses lib/md5.o bdiff.c -o bdiff
+-      strip bdiff
++      $(CC) $(CFLAGS) lib/md5.o bdiff.c -o bdiff
+ 
+ ppc: search.s bdiff.c lib/md5.o
+-      cc -O2 -Wall -Wno-parentheses -DPPCASM lib/md5.o search.s bdiff.c -o bdiff
+-      strip bdiff
++      $(CC) $(CFLAGS) -DPPCASM lib/md5.o search.s bdiff.c -o bdiff
+ 
+ nommap: bdiff.c lib/md5.o
+-      cc -O2 -Wall -Wno-parentheses -DNOMMAP lib/md5.o bdiff.c -o bdiff
+-      strip bdiff
++      $(CC) $(CFLAGS) -DNOMMAP lib/md5.o bdiff.c -o bdiff
  
  lib/md5.o:
 -      cc -O2 -D_LIBC -c lib/md5.c -o lib/md5.o
-+      cc -O2 -c lib/md5.c -o lib/md5.o
++      $(CC) $(CFLAGS) -c lib/md5.c -o lib/md5.o
  
  clean:
        rm -f bdiff search.o lib/md5.o

diff --git a/bdiff.spec b/bdiff.spec
index b5905c95983ede57737846a2625688a88f2c6f82..52c540436675a9d6bad89786db672f62b2f9d86d 100644 (file)
--- a/bdiff.spec
+++ b/bdiff.spec
@@ -24,7 +24,9 @@ files.
 %patch0 -p1
 
 %build
-%{__make}
+%{__make} \
+       CFLAGS="%{rpmcflags}" \
+       CC="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT