X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=backup%2FMakefile;h=6dfb904c964e9f27ca0d86aa872bdbdf8e9e5359;hp=a8c767e14b12b97a1e964ff8a64a131ac035e98e;hb=f0979352515324563d91f949eb123990dff35c36;hpb=e912e652c5a4d03307b47a209baa6dec5877ae45

diff --git a/backup/Makefile b/backup/Makefile
index a8c767e..6dfb904 100644
--- a/backup/Makefile
+++ b/backup/Makefile
@@ -25,9 +25,8 @@ us=	chiark-backup
 
 include ../settings.make
 
-BINSCRIPTS=	checkallused loaded driver takedown whatsthis labeltape \
-		snap-drop
-SHARESCRIPTS=	bringup full increm
+BINSCRIPTS=	checkallused loaded driver takedown whatsthis labeltape
+SHARESCRIPTS=	bringup full increm snap-drop
 SHAREFILES=	backuplib.pl
 SNAPKINDS=	lvm remount
 
@@ -42,7 +41,10 @@ install:		all
 			$(INSTALL_SCRIPT) $$s $(bindir)/backup-$$s; done
 		$(INSTALL_SHARE) $(SHAREFILES) $(sharedir)
 		$(INSTALL_SCRIPT) $(SHARESCRIPTS) $(sharedir)
-		$(INSTALL_SCRIPT) $(SNAPKINDS) $(confdir)/snap
+		set -e; for s in $(SNAPKINDS); do \
+			d=$(confdir)/snap/$$s; \
+			test ! -f $$d || d=$$d.dist; \
+			$(INSTALL_SCRIPT) $$s $$d; done
 
 install-docs:
 		$(INSTALL_DIRECTORY) $(txtdocdir)