[Blends-commit] [SCM] blends-dev branch, master, updated. 9298afe9d90c490bca0153b4c0aa20c084c7c7b6

[Mike Gabriel]

The following commit has been merged in the master branch:
commit 3a1e275c0c73755d690c605083ba761c9bababa7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Aug 11 23:31:00 2017 -0400

    devtools/Makefile: Make -D option configurable from the make command call (v2).

diff --git a/devtools/Makefile b/devtools/Makefile
index c2038a8..5dc9606 100755
--- a/devtools/Makefile
+++ b/devtools/Makefile
@@ -11,6 +11,7 @@
 TARGET_DIST := $(shell head -1 debian/changelog |awk '{print $$3}'|tr -d ';')
 BLEND := $(shell /usr/share/blends-dev/blend-get-names blendname)
 GENCONTROL := /usr/share/blends-dev/blend-gen-control
+GENCONTROL_NODEPENDS := $(shell grep GENCONTROL_NODEPENDS Makefile | cut -d "=" -f2 || echo -D)
 TASKSELOPTS := $(shell grep TASKSELOPTS Makefile | cut -d '=' -f2)
 
 # Verify whether config/control exists, if yes, add it to the depends of debian/control
@@ -23,7 +24,7 @@ debian/control: debian/control.stub debian/changelog tasks/* $(CONFIGCONTROL)
 	 echo "# This file is autogenerated via "make -f debian/rules dist".  Do not edit!"; \
 	 cat debian/control.stub; \
 	 test -f config/control && ( cat config/control; echo ) ; \
-	$(GENCONTROL) -s $(TARGET_DIST) -S -D -c -m -i -A) > $@.new && mv $@.new $@
+	$(GENCONTROL) -s $(TARGET_DIST) -S $(GENCONTROL_NODEPENDS) -c -m -i -A) > $@.new && mv $@.new $@
 
 tasksel: $(BLEND)-tasks.desc
 $(BLEND)-tasks.desc: tasks/* debian/changelog

-- 
Git repository for blends code