more automagic

1 files changed, 8 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 19b7158..2291da1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ all: control equivs-stamp
 
 include src/equivs.mk
 
-control_files = $(wildcard control.d/*.control)
+control_files := $(wildcard control.d/*.control)
 
 control: src/control.sh $(control_files) .git/refs/heads/master
         ./src/control.sh $(control_files) > $@
@@ -10,16 +10,18 @@ control: src/control.sh $(control_files) .git/refs/heads/master
 DD_USER = dyndns
 DD_GROUP = dyndns
 
-.PHONY: install all
+.PHONY: all install clean
 
 prefix = /usr/local
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
+bin_PROGRAMS := $(wildcard bin/*)
+export prefix exec_prefix bindir bin_PROGRAMS
 
-scripts = samizdat-ssh-command cryptonomic-dyndns-command
-executables = $(addprefix src/, $(scripts))
+clean:
+        rm -f control equivs-stamp
 
-install: equivs-stamp $(executables)
+install: equivs-stamp $(bin_PROGRAMS)
 ifneq ($(shell id -u),0)
         @sudo $(MAKE) MAKEFLAGS=$(MAKEFLAGS) $@
 else
@@ -29,7 +31,7 @@ else
         @chmod -v g+rwx /etc/powerdns
         @chmod -v g+rw /etc/powerdns/powerdns.sqlite3
         $(MAKE) ~$(DD_USER)/.ssh/authorized_keys
-        install $(executables) $(bindir)/
+        install $(bin_PROGRAMS) $(bindir)/
 endif
 
 define dyndns_authorized_keys_contents
@@ -38,4 +40,3 @@ endef
 
 ~$(DD_USER)/.ssh/authorized_keys:
         : writing file $@  $(file >$@,$(dyndns_authorized_keys_contents))
-