build system: switch to configure script and improved Makefile

This has dramatic effects on the build system complexity, and in the process
exposing lots of dead weight.

Split header files (.h1 .h2) are merged, and header files that only contained a
single define have been fully replaced with -D. The makefile is no longer
geneating scripts, and their files that hardcoded cc/ld/ar calls are gone.

The build system is now fully compatible with standard variables like CC,
PREFIX, DESTDIR, and such. The compiler is autodetected when unspecified, build
flags are checked for compatibility, and installation directories can now be
specified with configure flags.

The configure script was heavily inspired by XBPS's.

The "compile" script is gone along with the original top-level Makefile, both
replaced with straightforward and more conventional makefiles. The "man" and
"completions" subdirs are now integrated into the build system and use
configure-time variables for the paths.

No sed calls or patches should be required to set any paths or toolchain
settings.

Usage of .gitattributes and "$Id$" strings is now replaced with a VERSION
define in the configure script, which optionally uses git to append the 8-digit
commit hash to the version string. This also makes '-V' more meaningful.

Author: 0x5c

.gitattributes

@@ -0,0 +1,27 @@
+# Generated config
+config.mk
+
+# Objects
+*.o
+*.a
+
+# Generated manual pages
+runsv.8
+runsvchdir.8
+sv.8
+utmpset.8
+
+# Binaries
+src/chpst
+src/runit
+src/runit-init
+src/runsv
+src/runsvdir
+src/runsvchdir
+src/sv
+src/svlogd
+src/utmpset
+
+# Generated completions
+sv.bash
+sv.zsh

.gitignore

@@ -1,49 +1,33 @@
-DESTDIR=
+-include config.mk
 
-PACKAGE=runit-2.1.2
-DIRS=doc man etc package src
-MANPAGES=runit.8 runit-init.8 runsvdir.8 runsv.8 sv.8 utmpset.8 \
-  runsvchdir.8 svlogd.8 chpst.8
+SUBDIRS = src man completions
 
-all: clean .manpages $(PACKAGE).tar.gz
+.PHONY: all install uninstall check clean
 
-.manpages:
-	for i in $(MANPAGES); do \
-	  rman -S -f html -r '' < man/$$i | \
-	  sed -e "s}name='sect\([0-9]*\)' href='#toc[0-9]*'>\(.*\)}name='sect\1'>\2}g ; \
-	  s}<a href='#toc'>Table of Contents</a>}<a href='http://smarden.org/pape/'>G. Pape</a><br><a href='index.html'>runit</A><hr>}g ; \
-	  s}<!--.*-->}}g" \
-	  > doc/$$i.html ; \
-	done ; \
-	echo 'fix up html manually...'
-	echo 'patch -p0 <manpagehtml.diff && exit'
-	sh
-	find . -name '*.orig' -exec rm -f {} \;
-	touch .manpages
+all:
+	@if test ! -e config.mk; then \
+		echo "You didn't run ./configure ... exiting."; \
+		exit 1; \
+	fi
+	@for dir in $(SUBDIRS); do \
+		$(MAKE) -C $$dir || exit 1; \
+	done
 
-$(PACKAGE).tar.gz:
-	rm -rf TEMP
-	mkdir -p TEMP/admin/$(PACKAGE)
-	make -C src clean
-	cp -a $(DIRS) TEMP/admin/$(PACKAGE)/
-	ln -sf ../etc/debian TEMP/admin/$(PACKAGE)/doc/
-	for i in TEMP/admin/$(PACKAGE)/etc/*; do \
-	  test -d $$i && ln -s ../2 $$i/2; \
+install: all
+	@for dir in $(SUBDIRS); do \
+		$(MAKE) -C $$dir install || exit 1; \
 	done
-	chmod -R g-ws TEMP/admin
-	chmod +t TEMP/admin
-	find TEMP -exec touch {} \;
-	su -c '\
-	  chown -R root:root TEMP/admin ; \
-	  (cd TEMP && tar --exclude CVS -cpzf ../$(PACKAGE).tar.gz admin); \
-	  rm -rf TEMP'
 
-clean:
-	find . -name \*~ -exec rm -f {} \;
-	find . -name .??*~ -exec rm -f {} \;
-	find . -name \#?* -exec rm -f {} \;
+uninstall:
+	@for dir in $(SUBDIRS); do \
+		$(MAKE) -C $$dir uninstall || exit 1; \
+	done
 
-cleaner: clean
-	rm -f $(PACKAGE).tar.gz
-	for i in $(MANPAGES); do rm -f doc/`basename $$i`.html; done
-	rm -f .manpages
+check: all
+	$(MAKE) -C src check
+
+clean:
+	@for dir in $(SUBDIRS); do \
+		$(MAKE) -C $$dir clean || exit 1; \
+	done
+	-rm -f result* _ccflag.{,c,err}

.manpages

@@ -13,3 +13,10 @@ canonical version of the source code and to avoid the inclusion of patches in
 [void-packages](https://github.com/void-linux/void-packages). This also makes
 reviewing patches much simpler. If you have an issue or patch that you feel fits
 inside these objectives, please open an issue or pull request!
+
+## Build instructions
+
+```
+$ ./configure
+$ make && make install
+```

Makefile

@@ -0,0 +1,19 @@
+-include ../config.mk
+
+COMPLETIONS = sv.bash sv.zsh
+
+.PHONY: all install clean
+
+all: $(COMPLETIONS)
+
+$(COMPLETIONS):
+	$(SED) -e "s|@@SERVICEDIR@@|${SERVICEDIR}|g" $@.in > $@
+
+install: all
+	install -d $(DESTDIR)$(SHAREDIR)/bash-completion/completions
+	install -m644 sv.bash $(DESTDIR)$(SHAREDIR)/bash-completion/completions/sv
+	install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
+	install -m644 sv.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_sv
+
+clean:
+	rm -f $(COMPLETIONS)

README.md

@@ -16,7 +16,7 @@ _sv()
             return
             ;;
         *)
-            COMPREPLY=( /var/service/* )
+            COMPREPLY=( @@SERVICEDIR@@/* )
             COMPREPLY=( ${COMPREPLY[@]##*/} )
             COMPREPLY=( $(compgen -W '${COMPREPLY[@]}' -- ${cur}) )
             return

completions/Makefile

@@ -35,7 +35,7 @@ cmds)
         check
     ret=0;;
 args)
-    services=( /var/service/*(-/N:t) )
+    services=( @@SERVICEDIR@@/*(-/N:t) )
     (( $#services )) && _values services $services && ret=0
     [[ $words[CURRENT] = */* ]] && _directories && ret=0
     ;;