Don't FTBFS if config.mk doesn't exist

Origin: vendor
Bug-Debian: http://bugs.debian.org/720781
Forwarded: no

The config.mk file isn't guaranteed to exist (it gets removed by the Makefile's
"distclean" target). Including it with a straight "include" causes cmus to
FTBFS on the initial clean, since it doesn't exist and make aborts because it
can't include it. Instead, include it using "-include", which ignores it if it
doesn't exist.
Forwarded: no
Gbp-Pq: Name 01_config.mk.diff

diff --git a/Makefile b/Makefile
index 5401518dbbf7f5bd3cf91cbf216d29c3e07b3ee7..0cb52685ab92201671c6517460369f235bd4da79 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ VERSION       = $(or $(_ver0),$(_ver1),$(_ver2),$(_ver3))
 
 all: main plugins man
 
-include config.mk
+-include config.mk
 include scripts/lib.mk
 
 CFLAGS += -D_FILE_OFFSET_BITS=64