improvements

4 files changed, 13 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index fa022b9..19b7158 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,10 @@ all: control equivs-stamp
 
 include src/equivs.mk
 
-control: src/control.sh depends.control .git/refs/heads/master
-        ./src/control.sh depends.control > $@
+control_files = $(wildcard control.d/*.control)
+
+control: src/control.sh $(control_files) .git/refs/heads/master
+        ./src/control.sh $(control_files) > $@
 
 DD_USER = dyndns
 DD_GROUP = dyndns
@@ -19,7 +21,7 @@ executables = $(addprefix src/, $(scripts))
 
 install: equivs-stamp $(executables)
 ifneq ($(shell id -u),0)
-        sudo $(MAKE) MAKEFLAGS=$(MAKEFLAGS) $@
+        @sudo $(MAKE) MAKEFLAGS=$(MAKEFLAGS) $@
 else
         getent passwd $(DD_USER) || useradd --system --create-home $(DD_USER)
         @chown -v root:$(DD_GROUP) /etc/powerdns
diff --git a/depends.control b/control.d/depends.control
index 710c001..710c001 100644
--- a/depends.control
+++ b/control.d/depends.control
diff --git a/control.d/description.control b/control.d/description.control
new file mode 100644
index 0000000..96bb969
--- /dev/null
+++ b/control.d/description.control
@@ -0,0 +1,2 @@
+Description: Cryptonomic.net dynamic DNS service provider
+
diff --git a/src/equivs.mk b/src/equivs.mk
index d7f989a..18fc929 100644
--- a/src/equivs.mk
+++ b/src/equivs.mk
@@ -13,15 +13,18 @@ $(PKG_FILE): control
 
 equivs-stamp: control
         $(MAKE) $(PKG_FILE)
-        $(MAKE) install-remove-equivs
+        $(MAKE) install-equivs
         rm $(PKG_FILE)
         touch $@
 
 .PHONY: install-remove-equivs
-install-remove-equivs:
+
+install-equivs:
 ifneq (0,$(shell id -u))
         sudo $(MAKE) PKG_FILE=$(PKG_FILE) MAKEFLAGS=$(MAKEFLAGS) $@
 else
         dpkg -i $(PKG_FILE)
-        f=$(PKG_FILE); dpkg -r $${f%%_*}
+ifneq ($(REMOVE_EQUIVS_PACKAGE),)
+        dpkg -r $${PKG_FILE%%_*}
+endif
 endif