Patch from Anssi Hannula to avoid warnings when compiling with -Werror=format-security.

[filters.git] / Makefile

diff --git a/Makefile b/Makefile
index 8e7049d8c2301c6e3663a571a68bb0444df3ff26..81a90fca921f44b7bec35ab05918b69f7bdf8848 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 LEX    = flex
 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
+         censor spammer uniencode pirate kenny scottish fanboy
 CFLAGS = -O2 -lfl
+export CFLAGS
 INSTALL_PROGRAM = install
 
 # DEB_BUILD_OPTIONS suport, to control binary stripping.
@@ -15,20 +16,20 @@ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -g
 endif
 
-all:   $(OTHER) $(BUILD)
+all:   $(OTHER) $(BUILD) samples
 
 install:       $(BUILD) $(OTHER)
-       install -d $(PREFIX)/usr/games
-       $(INSTALL_PROGRAM) $(BUILD) $(PREFIX)/usr/games/
-       install $(OTHER) $(PREFIX)/usr/games/
-       install -d $(PREFIX)/usr/share/man/man6
-       install -m 0644 filters.6 $(PREFIX)/usr/share/man/man6
-       cd $(PREFIX)/usr/share/man/man6 && \
+       install -d $(DESTDIR)/usr/games
+       $(INSTALL_PROGRAM) $(BUILD) $(DESTDIR)/usr/games/
+       install $(OTHER) $(DESTDIR)/usr/games/
+       install -d $(DESTDIR)/usr/share/man/man6
+       install -m 0644 filters.6 $(DESTDIR)/usr/share/man/man6
+       cd $(DESTDIR)/usr/share/man/man6 && \
                $(foreach prog,$(BUILD) $(OTHER),ln -s filters.6 $(prog).6;)
 
 samples:       $(BUILD) $(OTHER)
        -rm -f SAMPLES
-       PATH=.:$$PATH; export PATH; echo $(BUILD) $(OTHER) |xargs -n 1 sh makesample.sh
+       PATH=.:$$PATH; export PATH; echo $(BUILD) $(OTHER) |grep -v fanboy |xargs -n 1 sh makesample.sh
 
 clean:
        $(RM) -f core *.o *~ $(BUILD) *.c SAMPLES
@@ -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