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

diff --git a/backup/Makefile b/backup/Makefile
index a8c767e..c4f0ae6 100644
--- a/backup/Makefile
+++ b/backup/Makefile
@@ -26,10 +26,10 @@ us=	chiark-backup
 include ../settings.make
 
 BINSCRIPTS=	checkallused loaded driver takedown whatsthis labeltape \
-		snap-drop
-SHARESCRIPTS=	bringup full increm
-SHAREFILES=	backuplib.pl
-SNAPKINDS=	lvm remount
+		snaprsync
+SHARESCRIPTS=	bringup full increm snap-drop
+SHAREFILES=	backuplib.pl snap-common
+SNAPKINDS=	lvm remount remountrocp
 
 EXAMPLES=	relativity chiark
 
@@ -42,7 +42,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)
@@ -55,7 +58,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