Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/cfd

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/cfd:
  texinice.tex: Cope with new names for page-dimension registers.

diff --git a/Makefile.am b/Makefile.am
index 5f91699..7df6892 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,9 +38,9 @@ CLEANFILES             =
 confsubst = $(srcdir)/confsubst.in
 mkdir_p = $(srcdir)/config/install-sh -d
 
-V_SUBST = $(V_SUBST_$(V))
-V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
-V_SUBST_0 = @echo "  SUBST  $@";
+V_SUBST = $(V_SUBST_@AM_V@)
+V_SUBST_ = $(V_SUBST_@AM_DEFAULT_V@)
+V_SUBST_0 = @echo "  SUBST    $@";
 SUBST = $(V_SUBST)$(confsubst)
 
 ###--------------------------------------------------------------------------

diff --git a/auto-version.in b/auto-version.in
index c9b1e27..d229a29 100755 (executable)
--- a/auto-version.in
+++ b/auto-version.in
@@ -71,7 +71,7 @@ fi
 ### Main program.
 
 ## If this is a Git checkout then Git should be able to identify the version.
-if [ -d .git ] && version=$(git describe --abbrev=4 2>/dev/null); then
+if [ -e .git ] && version=$(git describe --abbrev=4 2>/dev/null); then
 
   ## If the working tree is dirty, indicate with a `+'.
   case "$(git diff-index --name-only HEAD)" in

diff --git a/debian/rules b/debian/rules
index 028189f..0c0cde0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #! /usr/bin/make -f
 
-DH_OPTIONS = --parallel --without=autoreconf -Bdebian/build
-%:; dh $@ $(DH_OPTIONS)
+DH_OPTIONS = -Bdebian/build
+%:; dh $@ $(DH_OPTIONS) --without autoreconf
 
 override_dh_auto_install:
        dh_auto_install $(addprefix -O,$(DH_OPTIONS))