From f8cdbbce19b102fb958c56f628a4f76f7f3e5052 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Wed, 30 Aug 2017 23:27:28 +0100
Subject: slightly amend how user config is included

---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0c2933bf8..1c2f517d6 100644
--- a/Makefile
+++ b/Makefile
@@ -505,9 +505,12 @@ CXXWARNFLAGS :=
 # C default warning flags
 CWARNFLAGS := -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
 
-# Pull in the configuration
+# Pull in the default configuration
 include Makefile.defaults
 
+# Pull in the user configuration
+-include Makefile.config
+
 # libraries enabled by feature switch without pkgconfig file 
 $(eval $(call feature_switch,JPEG,JPEG (libjpeg),-DWITH_JPEG,-ljpeg,-UWITH_JPEG,))
 $(eval $(call feature_switch,HARU_PDF,PDF export (haru),-DWITH_PDF_EXPORT,-lhpdf -lpng,-UWITH_PDF_EXPORT,))
-- 
cgit v1.2.3