X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=backup%2FMakefile;h=2efa2578fdfedfb9094150195175805b08fc7e0f;hp=ce06ceef824f6a70d63b2264a1b90c0b252b08fa;hb=cf0ee9747debc62a3a979f3d259b25688a543955;hpb=7d4185f54b99fef18f8661ea1d5974171f997f1e

diff --git a/backup/Makefile b/backup/Makefile
index ce06cee..2efa257 100644
--- a/backup/Makefile
+++ b/backup/Makefile
@@ -26,7 +26,7 @@ us=	chiark-backup
 include ../settings.make
 
 BINSCRIPTS=	checkallused loaded driver takedown whatsthis labeltape
-SHARESCRIPTS=	bringup full increm
+SHARESCRIPTS=	bringup full increm snap-drop
 SHAREFILES=	backuplib.pl
 SNAPKINDS=	lvm remount
 
@@ -41,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)
@@ -54,7 +57,7 @@ install-examples:
 			$(INSTALL_SHARE) [^A-Z]*[^~] $(exampledir)/$$e; \
 			if test -f SYMLINKS.tar; then \
 				exec <SYMLINKS.tar; \
-				(set -e; cd $(exampledir) && tar -xf -); \
+				(set -e; cd $(exampledir)/$$e && tar -xf -); \
 			fi; \
 			cd ../..; \
 		done