renames & directory location changes

2 files changed, 10 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index b33f1b9..739370d 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,14 @@ DD_GROUP = dyndns
 
 .PHONY: install all
 
-install: equivs-stamp
+prefix = /usr/local
+exec_prefix = $(prefix)
+bindir = $(exec_prefix)/bin
+
+scripts = samizdat-ssh-command cryptonomic-dyndns-command
+executables = $(addprefix src/, $(scripts))
+
+install: equivs-stamp $(executables)
 ifneq ($(shell id -u),0)
         sudo $(MAKE) MAKEFLAGS=$(MAKEFLAGS) $@
 else
@@ -20,12 +27,11 @@ else
         @chmod -v g+rwx /etc/powerdns
         @chmod -v g+rw /etc/powerdns/powerdns.sqlite3
         $(MAKE) ~$(DD_USER)/.ssh/authorized_keys
-        install src/samizdat-ssh-command /usr/local/bin/
-        install src/dyndns-command.sh ~$(DD_USER)/samizdat-default-command
+        install $(executables) $(bindir)/
 endif
 
 define dyndns_authorized_keys_contents
-command="/usr/local/bin/samizdat-ssh-command /etc/powerdns/dyndns-command.sh",no-port-forwarding * Samizdat - YES WE CAN
+command="$(bindir)/samizdat-ssh-command /etc/powerdns/dyndns-command.sh",no-port-forwarding * Samizdat - YES WE CAN
 endef
 
 ~$(DD_USER)/.ssh/authorized_keys:
diff --git a/src/dyndns-command.sh b/src/cryptonomic-dyndns-command
index 375d50b..375d50b 100755
--- a/src/dyndns-command.sh
+++ b/src/cryptonomic-dyndns-command