@@ -1,11 +1,13 @@

[chiark-utils.git] / backup / Makefile

diff --git a/backup/Makefile b/backup/Makefile
index 207766ffddbd5acef709f0d3b276e5be5fe711d1..2efa2578fdfedfb9094150195175805b08fc7e0f 100644 (file)
--- a/backup/Makefile
+++ b/backup/Makefile
@@ -21,57 +21,30 @@
 # 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
 
-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 root
-INSTALL_SCRIPT=                $(INSTALL) -m 755 -o root -g root
-INSTALL_PROGRAM=       $(INSTALL_SCRIPT) -s
-INSTALL_DIRECTORY=     $(INSTALL) -m 2755 -o root -g root -d
-
-CTARGETS=      readbuffer writebuffer
 BINSCRIPTS=    checkallused loaded driver takedown whatsthis labeltape
-SHARESCRIPTS=  bringup full increm
+SHARESCRIPTS=  bringup full increm snap-drop
 SHAREFILES=    backuplib.pl
+SNAPKINDS=     lvm remount
 
 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)
@@ -84,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
@@ -93,4 +66,3 @@ clean:
                rm -f *~ ./#*# *.o
 
 distclean realclean:   clean
-               rm -f $(CTARGETS)