X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=Makefile;h=1f7dbe878f4311ecb7bf7005daa7c3cc4261fa78;hb=refs%2Fheads%2Fdebian;hp=1daf2e75500befc3139cea4c00cb8fdc1cdc7a67;hpb=72dcc91a54e60f17b516d21ccd252afa78e14b0d;p=rrq%2Foverlay-boot.git

diff --git a/Makefile b/Makefile
index 1daf2e7..1f7dbe8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,17 @@
-SBINDIR = $(DESTDIR)/usr/sbin
-#ETCDIR = $(DESTDIR)/etc/overlay
-#MAN1DIR = $(DESTDIR)/usr/share/man/man1
+ETCDIR = $(DESTDIR)/etc
+INITDIR = $(DESTDIR)/etc/init.d
 MAN8DIR = $(DESTDIR)/usr/share/man/man8
+SBINDIR = $(DESTDIR)/usr/sbin
 VARLIBDIR = $(DESTDIR)/var/lib/overlay-boot
 
-#SBINCFILES =
-#SBINFILES = overlay-boot overlay-go overlay-stop
-# The SBINFILES are installed via links; see debian/overlay-boot.links
-#ETCFILES =
-#MAN1FILES = 
-MAN8FILES = overlay-boot.8 overlay-go.8 overlay-stop.8
-#HTMLDOC = $(MAN8FILES:%=%.html)
+MAN8FILES = overlay-boot.8 overlay-go.8 overlay-stop.8 overlay-diskfile.8
+MAN8FILES += overlay-share.8
 VARLIBFILES = overlay-boot overlay-go overlay-stop functions reaper
 VARLIBFILES += overlay-init overlay-postmount overlay-premount
+VARLIBFILES += overlay-diskfile
+VARLIBFILES += overlay-share
+INITFILES = subhosts
+ETCFILES = subhosts.conf
 
 # The default is to build asm/reaper
 REAPER = src/reaper
@@ -26,13 +25,21 @@ $(REAPER):
 reaper: $(REAPER)
 	mv $< $@
 
+# Specific rule: the sysvinit init file
+$(INITDIR)/subhosts: subhosts.sh | $(INITDIR)/
+	cp $< $@
+
+# Specific rule: the sysvinit init configuration file
+$(ETCDIR)/subhosts.conf: subhosts.conf | $(ETCDIR)/
+	cp $< $@
+
 # Generic rule: any dependee directory needs to be created
 %/:
 	mkdir -p $@
 
 # Generic rule: a local .8 file depends on the same .8.adoc file, if any
 $(MAN8FILES): %: %.adoc
-	a2x -d manpage -f manpage $^
+	asciidoctor -b manpage $^
 
 # Generic rule: an installed MAN8FILE file depends on a local the
 # same, and that the installation directory exists
@@ -52,11 +59,11 @@ clean:
 .INTERMEDIATE: reaper $(MAN8FILES)
 
 # Make target: enumerates that which should be installed
-#INSTALLTARGETS = $(addprefix $(SBINDIR)/,$(SBINFILES))
-#INSTALLTARGETS += $(addprefix $(ETCDIR)/,$(ETCFILES))
-#INSTALLTARGETS += $(addprefix $(MAN1DIR)/,$(MAN1FILES))
 INSTALLTARGETS += $(addprefix $(MAN8DIR)/,$(MAN8FILES))
 INSTALLTARGETS += $(addprefix $(VARLIBDIR)/,$(VARLIBFILES))
+INSTALLTARGETS += $(addprefix $(INITDIR)/,$(INITFILES))
+INSTALLTARGETS += $(addprefix $(ETCDIR)/,$(ETCFILES))
+
 install: $(INSTALLTARGETS)
 
 # Make target: make a .deb file in ../
@@ -64,3 +71,7 @@ BUILDPACKAGE = -us -uc --build=full -Iolle
 deb:
 	dpkg-buildpackage $(BUILDPACKAGE)
 #	PREFIX= INCLUDE_PREFIX=/usr
+
+build:
+	gbp buildpackage --git-debian-branch=debian --git-export-dir=build \
+                         --git-ignore-new