[Notion-devel] [PATCH] include $(TOPDIR)/config.mk if it exists

[Matthias L. <ma...@gm...>]

Please tell me if there is already a way to do this currently.  From
what I saw in the README and makefiles the way to go is to edit
system.mk which results in conflicts when pulling.  I've added
loading of config.mk, if it exists.

TODO: add to documentation
---
 .gitignore          |    1 +
 build/system-inc.mk |    2 ++
 2 files changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index a2b1f94..7c5d9ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ tags
 *.gcda
 *.tar.gz
 .*.swp
+config.mk
 exports.[ch]
 po/*.mo
 man/*.1
diff --git a/build/system-inc.mk b/build/system-inc.mk
index 39a767a..f7ad247 100644
--- a/build/system-inc.mk
+++ b/build/system-inc.mk
@@ -15,4 +15,6 @@ else
   include $(SYSTEM_MK)
 endif
 
+-include $(TOPDIR)/config.mk
+
 include $(TOPDIR)/build/libs.mk
-- 
1.7.10.4