X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/1b94e7ee3040fa3957a3555a2aa30a8af0392c00..73c704c216496970c36764e4b47d28e91fe32d7e:/.ssh/Makefile

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 25b571f..168f1b6 100644
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -1,30 +1,32 @@
 all: known_hosts authorized_keys config
+	@chmod -R og= .
 .PHONY: all
 
 known_hosts: $(wildcard known_hosts.d/*)
 	touch $@
 	for f in $^; do \
-	  echo; \
 	  echo "### from $$f:"; \
 	  cat $$f; \
-	done >> $@
+	  echo; \
+	done > $@
 
 authorized_keys: $(wildcard authorized_keys.d/*)
 	touch $@
 	for f in $^; do \
-	  echo; \
 	  echo "### from $$f:"; \
 	  cat $$f; \
-	done >> $@
+	  echo; \
+	done > $@
+
+ifeq ($(strip $(wildcard config.local)),)
+LOCAL_CONFIG=/dev/null
+else
+LOCAL_CONFIG=config.local
+endif
 
 SSH_VERSION = $(shell ssh -V 2>&1)
-config: config.in
-	cp $< $@
-	case "$(SSH_VERSION)" in \
-	  (OpenSSH_4.3*) \
-	    sed -ri -e 's,^.+\bExitOnForwardFailure\b.+$$,##UNSUPPORTED##&,' \
-	            -e 's,^.+\bMACs\b.+$$,##UNSUPPORTED##&,' \
-	            -e 's,^(.+ControlPath ~/.var/ssh/ssh_control_)%l_(.+),\1\2,' \
-	            $@ \
-	    ;; \
-	esac
+config: $(LOCAL_CONFIG) config.in
+	cat $^ > $@
+	if ! ssh -P 2>&1 | grep -q 'option requires an argument'; then \
+		sed -i -e '/^Match tagged/,/^$$/d' $@; \
+	fi