From: Ryan Kavanagh <rak@debian.org>
Date: Thu, 14 Aug 2014 12:45:10 +0000 (+0100)
Subject: Don't FTBFS if config.mk doesn't exist
X-Git-Tag: archive/raspbian/2.9.1-1+rpi1~1^2^2^2^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9df9e403bde7e425a62b3b81cba15d6707877d1f;p=cmus.git

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 5401518..0cb5268 100644
--- 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