update changelog; make the Makefile support a MAKEFILE_CONF parameter to not have...

[xonotic/netradiant.git] / Makefile

diff --git a/Makefile b/Makefile
index 7bd232ccc2ecaf5632905af08c9cf86c79b89d49..e3d5ddcd526562f431148544fa7fb44d1cbf8424 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
--include Makefile.conf
+MAKEFILE_CONF      ?= Makefile.conf
+-include $(MAKEFILE_CONF)
 
 ## CONFIGURATION SETTINGS
 # user customizable stuf