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

diff --git a/backup/Makefile b/backup/Makefile
index a8c767e..9ca10ba 100644
--- a/backup/Makefile
+++ b/backup/Makefile
@@ -5,12 +5,13 @@
 # other UN*X-compatible machines, as used on chiark.greenend.org.uk.
 #
 # chiark backup is:
-#  Copyright (C) 1997-1998,2000-2001 Ian Jackson <ian@chiark.greenend.org.uk>
+#  Copyright (C) 1997-1998,2000-2001,2007
+#                     Ian Jackson <ian@chiark.greenend.org.uk>
 #  Copyright (C) 1999 Peter Maydell <pmaydell@chiark.greenend.org.uk>
 #
 # This is free software; you can redistribute it and/or modify it under the
 # terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2, or (at your option) any later version.
+# Foundation; either version 3, or (at your option) any later version.
 #
 # This is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -18,18 +19,18 @@
 # details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 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 nosnap
 
 EXAMPLES=	relativity chiark
 
@@ -42,7 +43,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)
@@ -52,10 +56,10 @@ install-examples:
 		set -e; for e in $(EXAMPLES); do \
 			cd examples/$$e; \
 			$(INSTALL_DIRECTORY) $(exampledir)/$$e; \
-			$(INSTALL_SHARE) [^A-Z]*[^~] $(exampledir)/$$e; \
+			$(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