update changelog; make the Makefile support a MAKEFILE_CONF parameter to not have...
[xonotic/netradiant.git] / Makefile
index 7bd232c..e3d5ddc 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