[Monotone-commits-diffs] net.venge.monotone.contrib.usher: 91c74c313c96a14cb4a1eef997b718ab492c7c0c

[code]

revision:            91c74c313c96a14cb4a1eef997b718ab492c7c0c
date:                2011-01-20T10:53:57
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.contrib.usher
changelog:
Make utils/usherctl and the manpages substitutable.  Among others,
it means we don't have to change the version number in more than one place.
It also means that usherctl is better adapted to varying environments.

manifest:
format_version "1"

new_manifest [4aa36ae373219c77463511a2ab20faadd2b57363]

old_revision [be2f09fb943b095fc0ef79bab8742e1fa060b4e8]

rename "doc/usher.1"
    to "doc/usher.man"

rename "doc/usher.conf.5"
    to "doc/usher.conf.man"

rename "doc/usherctl.1"
    to "doc/usherctl.man"

rename "utils/usherctl"
    to "utils/usherctl.in"

patch "Makefile.am"
 from [12ef5505cbe7b8edb2286b97db38399fcdf26af1]
   to [dc019f02e27baa3fea6a760c8df92a50154d4a2d]

patch "doc/usher.conf.man"
 from [7a7f424ffcc8d596e24cd61060cac707338ed781]
   to [8ebd004644b5c138f8cda7afa8729574f23062cf]

patch "doc/usher.man"
 from [ada4715fe014deb2c039d5e21a85247e467d4ea3]
   to [26c13c38c1676d8b6d998041fdcf2f9b58a291af]

patch "doc/usherctl.man"
 from [2e1ec8938f07b2999e44af3f75d9fc57a6059e6d]
   to [de7df674360af110a54c408a0fa41418f67e47fe]

patch "release-checklist.txt"
 from [9e83fa6182a09380ff888f979da7ad508f133b08]
   to [aa9dd9635c12893d92c681b47d29424bea907bf3]

patch "utils/usherctl.in"
 from [9e6e3d16e444661f17a21a88b96569eb2426ba9d]
   to [8bb7514edca6aac89903dd4d9e8499a232bff8ee]
============================================================
--- Makefile.am	12ef5505cbe7b8edb2286b97db38399fcdf26af1
+++ Makefile.am	dc019f02e27baa3fea6a760c8df92a50154d4a2d
@@ -17,14 +17,35 @@ usher_CPPFLAGS = -Wall -pedantic -Wextra
 
 usher_CPPFLAGS = -Wall -pedantic -Wextra
 
-dist_bin_SCRIPTS = utils/usherctl
+bin_SCRIPTS = usherctl
 
-dist_man1_MANS = doc/usherctl.1 doc/usher.1
-dist_man5_MANS = doc/usher.conf.5
+man1_MANS = doc/usherctl.1 doc/usher.1
+man5_MANS = doc/usher.conf.5
 
 TESTS=test/run-tests.sh
 
-EXTRA_DIST = test doc/documentation.html
+CLEANFILES = $(dist_man1_MANS) $(dist_man5_MANS) $(bin_SCRIPTS)
+EXTRA_DIST = test doc/documentation.html \
+	doc/usher.man doc/usher.conf.man doc/usherctl.man
+	utils/usherctl.in
 
 mostlyclean-local:
 	rm -rf test-dir
+
+do_subst = sed \
+	-e 's,address@hidden@],$(bindir),g' \
+	-e 's,address@hidden@],$(sysconfdir),g' \
+	-e 's,address@hidden@],$(localstatedir),g' \
+	-e 's,address@hidden@],$(PACKAGE),g' \
+	-e 's,address@hidden@],$(VERSION),g'
+
+usherctl: utils/usherctl.in Makefile
+	$(do_subst) < $< > $@
+	chmod +x $@
+
+.man.1: Makefile
+	$(MKDIR_P) `dirname address@hidden
+	$(do_subst) < $< > $@
+.man.5: Makefile
+	$(MKDIR_P) `dirname address@hidden
+	$(do_subst) < $< > $@
============================================================
--- utils/usherctl	9e6e3d16e444661f17a21a88b96569eb2426ba9d
+++ utils/usherctl.in	8bb7514edca6aac89903dd4d9e8499a232bff8ee
@@ -4,17 +4,17 @@
 # configuration, add, modify or remove servers, and reload the
 # usher process.
 
-USHER=/usr/bin/usher
-MTN=/usr/bin/mtn
address@hidden@/usher
address@hidden@/mtn
 
 # Check if the user wants to use a configuration file to set the
 # following variables to values other than the default:
 # USHER			Usher binary.
-#			(default: /usr/bin/usher)
+#			(default: @bindir@/usher)
 # MTN			Monotone binary.
-#			(default: /usr/bin/mtn)
+#			(default: @bindir@/mtn)
 # USHER_CONFDIR		Configuration directory.
-#			(default: /etc/usher)
+#			(default: @sysconfdir@/usher)
 # USHER_CONF		Actual configuration file.
 #			(default: $USHER_CONFDIR/usher.conf)
 # USHER_GLOBALCONF	Global configuration template.
@@ -24,11 +24,11 @@ MTN=/usr/bin/mtn
 # USHER_SKEL		Directory for project skeleton files.
 #			(default: $USHER_CONFDIR/skel)
 # USHER_PIDFILE		Usher PID file.
-#			(default: /var/run/usher.pid)
+#			(default: @localstatedir@/run/usher.pid)
 # USHER_LOGDIR		Usher log directory.
-#			(default: /var/log/usher)
+#			(default: @localstatedir@/log/usher)
 # USHER_PROJECTDIR	Usher projects directory.
-#			(default: /var/lib/usher/projects)
+#			(default: @localstatedir@/lib/usher/projects)
 #
 # The following variables are only useful for the system administrator
 # that wants to set up a system wide usher.
@@ -50,7 +50,7 @@ MTN=/usr/bin/mtn
 #			usher is started with /etc/init.d/usher.
 #			MUST match the group usher is started as!
 
-config_file="/etc/usher/usherctl.conf"
+config_file="@sysconfdir@/usher/usherctl.conf"
 
 TEMP=`POSIXLY_CORRECT=yes getopt -o c: -n usherctl -- "$@"`
 eval set -- "$TEMP"
@@ -72,14 +72,14 @@ done
 . "$config_file"
 
 # Apply default where nothing is set.
-USHER_CONFDIR=${USHER_CONFDIR:-/etc/usher}
+USHER_CONFDIR=${USHER_CONFDIR:address@hidden@/usher}
 USHER_CONF=${USHER_CONF:-"$USHER_CONFDIR/usher.conf"}
 USHER_GLOBALCONF=${USHER_GLOBALCONF:-"$USHER_CONFDIR/global.conf"}
 USHER_CONFD=${USHER_CONFD:-"$USHER_CONFDIR/conf.d"}
 USHER_SKEL=${USHER_SKEL:-"$USHER_CONFDIR/skel"}
-USHER_PIDFILE=${USHER_PIDFILE:-/var/run/usher.pid}
-USHER_LOGDIR=${USHER_LOGDIR:-/var/log/usher}
-USHER_PROJECTDIR=${USHER_PROJECTDIR:-/var/lib/usher/projects}
+USHER_PIDFILE=${USHER_PIDFILE:address@hidden@/run/usher.pid}
+USHER_LOGDIR=${USHER_LOGDIR:address@hidden@/log/usher}
+USHER_PROJECTDIR=${USHER_PROJECTDIR:address@hidden@/lib/usher/projects}
 
 THIS="$0"
 
============================================================
--- release-checklist.txt	9e83fa6182a09380ff888f979da7ad508f133b08
+++ release-checklist.txt	aa9dd9635c12893d92c681b47d29424bea907bf3
@@ -7,11 +7,11 @@
 
 * make sure the date at the top of NEWS is filled out
 
-* take the "~dev" out of the version in configure.in and manpages in doc/
+* take the "~dev" out of the version in configure.in
 
 * commit; run autoreconf -i, configure, and "make distcheck" in a clean checkout
 
 * add a tag, post the tarball, and email monotone-devel
 
 * add a new blank release date at the top of NEWS, increment the
-  version number and add "~dev" in configure.in and manpages in doc/
+  version number and add "~dev" in configure.in
============================================================
--- doc/usherctl.1	2e1ec8938f07b2999e44af3f75d9fc57a6059e6d
+++ doc/usherctl.man	de7df674360af110a54c408a0fa41418f67e47fe
@@ -10,7 +10,7 @@
 .\" optional markers ([, ], ...): regular (\fP)
 .\" verbatim text (examples and output): courier (\fC)
 .\"
-.TH "USHERCTL" 1 "2011-01-18" "usher 1.0~dev" "Monotone program suite"
+.TH "USHERCTL" 1 "2011-01-18" "@PACKAGE@ @VERSION@" "Monotone program suite"
 .SH "NAME"
 usherctl - project and process control for usher
 .SH "SYNOPSIS"
@@ -192,17 +192,17 @@ Usher binary.
 \fBUSHER\fP
 Usher binary.
 .IP
-(default: \fC/usr/bin/usher\fP)
+(default: address@hidden@/usher\fP)
 .TP
 \fBMTN\fP
 Monotone binary.
 .IP
-(default: \fC/usr/bin/mtn\fP)
+(default: address@hidden@/mtn\fP)
 .TP
 \fBUSHER_CONFDIR\fP
 Configuration directory.
 .IP
-(default: \fC/etc/usher\fP)
+(default: address@hidden@/usher\fP)
 .TP
 \fBUSHER_CONF\fP
 Actual configuration file.
@@ -227,17 +227,17 @@ Usher PID file.
 \fBUSHER_PIDFILE\fP
 Usher PID file.
 .IP
-(default: \fC/var/run/usher.pid\fP)
+(default: address@hidden@/run/usher.pid\fP)
 .TP
 \fBUSHER_LOGDIR\fP
 Usher log directory.
 .IP
-(default: \fC/var/log/usher\fP)
+(default: address@hidden@/log/usher\fP)
 .TP
 \fBUSHER_PROJECTDIR\fP
 Usher projects directory.
 .IP
-(default: \fC/var/lib/usher/projects\fP)
+(default: address@hidden@/lib/usher/projects\fP)
 .PP
 The following variables are only useful for the system administrator
 that wants to set up a system wide usher:
============================================================
--- doc/usher.1	ada4715fe014deb2c039d5e21a85247e467d4ea3
+++ doc/usher.man	26c13c38c1676d8b6d998041fdcf2f9b58a291af
@@ -10,7 +10,7 @@
 .\" optional markers ([, ], ...): regular (\fP)
 .\" verbatim text (examples and output): courier (\fC)
 .\"
-.TH "USHER" 1 "2011-01-18" "usher 1.0~dev" "Monotone program suite"
+.TH "USHER" 1 "2011-01-18" "@PACKAGE@ @VERSION@" "Monotone program suite"
 .SH "NAME"
 usher \- dispatcher for monotone to serve several project databases
 .SH "SYNOPSIS"
============================================================
--- doc/usher.conf.5	7a7f424ffcc8d596e24cd61060cac707338ed781
+++ doc/usher.conf.man	8ebd004644b5c138f8cda7afa8729574f23062cf
@@ -10,7 +10,7 @@
 .\" optional markers ([, ], ...): regular (\fP)
 .\" verbatim text (examples and output): courier (\fC)
 .\"
-.TH "USHER.CONF" 5 "2011-01-18" "usher 1.0~dev" "Monotone program suite"
+.TH "USHER.CONF" 5 "2011-01-18" "@PACKAGE@ @VERSION" "Monotone program suite"
 .SH "NAME"
 usher.conf \- configuration file for usher
 .SH "DESCRIPTION"