X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=backup%2FMakefile;h=5e23d06b87a9e0110ef01c1b6bf60aa1479453b5;hp=938dd27bc52a6049e83234d1aa5c50a083dcb19e;hb=389e6cc9611001e7a53469867ba42fa8fb429038;hpb=78a74565c7a41d62d008fc6d93eba9e869792624

diff --git a/backup/Makefile b/backup/Makefile
index 938dd27..5e23d06 100644
--- a/backup/Makefile
+++ b/backup/Makefile
@@ -21,59 +21,31 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-CC=		gcc
-CFLAGS=		$(WARNINGS) $(OPTIMISE) $(DEBUG)
-CPPFLAGS=	-DRWBUFFER_SIZE_MB=$(RWBUFFER_SIZE_MB)
+us=	chiark-backup
 
-WARNINGS=	-Wall -Wwrite-strings -Wmissing-prototypes \
-		-Wstrict-prototypes -Wpointer-arith
-OPTIMISE=	-O2
-DEBUG=		-g
-RWBUFFER_SIZE_MB=16
+include ../settings.make
 
-SYSTEM_GROUP=	root
-
-prefix=/usr/local
-etcdir=/etc
-varlib=/var/lib
-
-confdir=$(etcdir)/chiark-backup
-bindir=$(prefix)/bin
-sharedir=$(prefix)/share/chiark-backup
-txtdocdir=$(prefix)/share/doc/chiark-backup
-exampledir=$(txtdocdir)/examples
-vardir=$(varlib)/chiark-backup
-mandir=${prefix}/man
-man1dir=${mandir}/man1
-
-INSTALL=		install -c
-INSTALL_SHARE=		$(INSTALL) -m 644 -o root -g $(SYSTEM_GROUP)
-INSTALL_SCRIPT=		$(INSTALL) -m 755 -o root -g $(SYSTEM_GROUP)
-INSTALL_PROGRAM=	$(INSTALL_SCRIPT) -s
-INSTALL_DIRECTORY=	$(INSTALL) -m 2755 -o root -g $(SYSTEM_GROUP) -d
-
-CTARGETS=	readbuffer writebuffer
-BINSCRIPTS=	checkallused loaded driver takedown whatsthis labeltape
-SHARESCRIPTS=	bringup full increm
+BINSCRIPTS=	checkallused loaded driver takedown whatsthis labeltape \
+		snaprsync
+SHARESCRIPTS=	bringup full increm snap-drop
 SHAREFILES=	backuplib.pl
+SNAPKINDS=	lvm remountrocp
 
 EXAMPLES=	relativity chiark
 
-all:		$(CTARGETS)
-
-readbuffer:				readbuffer.o rwbuffer.o
-writebuffer:				writebuffer.o rwbuffer.o
-readbuffer.o writebuffer.o rwbuffer.o:	rwbuffer.h
+all:
 
 install:		all
-		$(INSTALL_DIRECTORY) $(confdir) $(bindir) $(sharedir) $(vardir) $(man1dir)
-		$(INSTALL_PROGRAM) $(CTARGETS) $(bindir)
+		$(INSTALL_DIRECTORY) $(confdir) $(confdir)/snap $(bindir) \
+			$(sharedir) $(vardir) $(man1dir)
 		set -e; for s in $(BINSCRIPTS); do \
 			$(INSTALL_SCRIPT) $$s $(bindir)/backup-$$s; done
 		$(INSTALL_SHARE) $(SHAREFILES) $(sharedir)
 		$(INSTALL_SCRIPT) $(SHARESCRIPTS) $(sharedir)
-		$(INSTALL) -m 644 readbuffer.1 ${man1dir}/readbuffer.1
-		$(INSTALL) -m 644 writebuffer.1 ${man1dir}/writebuffer.1
+		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)
@@ -86,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
@@ -95,4 +67,3 @@ clean:
 		rm -f *~ ./#*# *.o
 
 distclean realclean:	clean
-		rm -f $(CTARGETS)