more automagic

6 files changed, 28 insertions, 12 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))
-
diff --git a/src/cryptonomic-dyndns-command b/bin/cryptonomic-dyndns-command
index 375d50b..375d50b 100755
--- a/src/cryptonomic-dyndns-command
+++ b/bin/cryptonomic-dyndns-command
diff --git a/src/samizdat-ssh-command b/bin/samizdat-ssh-command
index a03b554..a03b554 100755
--- a/src/samizdat-ssh-command
+++ b/bin/samizdat-ssh-command
diff --git a/src/samizdat-ssh-uid b/bin/samizdat-ssh-uid
index 2b4b311..2b4b311 100755
--- a/src/samizdat-ssh-uid
+++ b/bin/samizdat-ssh-uid
diff --git a/src/control.sh b/src/control.sh
index 7106187..370e64a 100755
--- a/src/control.sh
+++ b/src/control.sh
@@ -1,10 +1,25 @@
 #!/bin/sh
-VERSION=${VERSION:-$(TZ=UTC date -Is | tr -d :- | tr T . | sed 's/+.*//')}
+: ${VERSION:=$(TZ=UTC date -Is | tr -d :- | tr T . | sed 's/+.*//')}
+: ${PKG:=$(basename $(pwd))}
+: ${ARCH:=$(dpkg-architecture -q DEB_BUILD_ARCH)}
 cat - "$@" <<END
-Package: $(basename $(pwd))
-Source: $(basename $(pwd))
+Package: ${PKG}
+Source: ${PKG}
 Version: ${VERSION}
-Architecture: $(dpkg-architecture -q DEB_BUILD_ARCH)
+Architecture: ${ARCH}
 Origin: local
 Maintainer: root <root@localhost>
 END
+
+set --
+
+[ "$exec_prefix" ] || exit 0
+for f in bin/*
+do
+        [ -f "$f" ] || continue
+        set -- "$@" "$f ${exec_prefix}"
+done
+[ $# -gt 0 ] || exit 0
+
+printf 'Files:'
+printf ' %s\n' "$@"
diff --git a/src/equivs.mk b/src/equivs.mk
index 18fc929..7035250 100644
--- a/src/equivs.mk
+++ b/src/equivs.mk
@@ -17,7 +17,7 @@ equivs-stamp: control
         rm $(PKG_FILE)
         touch $@
 
-.PHONY: install-remove-equivs
+.PHONY: install-equivs
 
 install-equivs:
 ifneq (0,$(shell id -u))