Work around dpkg bug #476138. Closes: #475979

* Work around dpkg bug #476138. Closes: #475979
* Use CC consistently.

diff --git a/Makefile b/Makefile
index 183d7c737730d81b5e428ce355a77f304b176371..a7d15ff975464d6dcc58a05cd6bccf460bb634e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ BUILD   = jethro kraut cockney jive nyc ken ky00te newspeak nethackify
 OTHER  = eleet b1ff chef jibberish upside-down rasterman studly fudd \
          censor spammer uniencode pirate kenny scottish fanboy
 CFLAGS = -O2 -lfl
+export CFLAGS
 INSTALL_PROGRAM = install
 
 # DEB_BUILD_OPTIONS suport, to control binary stripping.
@@ -54,7 +55,7 @@ ky00te:
 
 kraut:
        cd kraut.dir && lex kraut.l
-       cd kraut.dir && cc kraut.c lex.yy.c -o ../kraut
+       cd kraut.dir && $(CC) kraut.c lex.yy.c -o ../kraut
 
 nethackify:
        cd nethackify.dir && make

diff --git a/debian/changelog b/debian/changelog
index 717a2db7a9110cb115dca06517f4a5691d78cbe7..56336983d8ba6c6fc415041a2692f4a67776aadd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+filters (2.44) unstable; urgency=low
+
+  * Work around dpkg bug #476138. Closes: #475979
+  * Use CC consistently.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 14 Apr 2008 13:26:53 -0400
+
 filters (2.43) unstable; urgency=low
 
   * Added the fanboy filter.

diff --git a/ky00te.dir/makefile b/ky00te.dir/makefile
index 90a8efebbc9ef6c47a0922a8fe559bf565dafd6d..47d1f6490219cc18e9b3e373f9d51edb1781aba4 100644 (file)
--- a/ky00te.dir/makefile
+++ b/ky00te.dir/makefile
@@ -5,13 +5,13 @@ clean:
        rm -f ../ky00te
 
 ../ky00te: y.tab.o lex.yy.o
-       cc $(CFLAGS) -o ../ky00te lex.yy.o y.tab.o -lfl
+       $(CC) -o ../ky00te lex.yy.o y.tab.o $(CFLAGS)
 
 lex.yy.o: lex.yy.c y.tab.h
-       cc $(CFLAGS) -c lex.yy.c
+       $(CC) $(CFLAGS) -c lex.yy.c
 
 y.tab.o: y.tab.c
-       cc $(CFLAGS) -c y.tab.c
+       $(CC) $(CFLAGS) -c y.tab.c
 
 lex.yy.c: ky00te.lex
        flex ky00te.lex