couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [10/50] git commit: Improved maint checks
Date Sun, 18 Nov 2012 16:56:23 GMT
Improved maint checks


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/70693b8e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/70693b8e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/70693b8e

Branch: refs/heads/docs
Commit: 70693b8ea9ed2dc8c65d1ef413032c2aabc8e19e
Parents: ffaa5fd
Author: Noah Slater <nslater@apache.org>
Authored: Sun Oct 14 14:18:01 2012 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Sun Nov 18 00:15:32 2012 +0000

----------------------------------------------------------------------
 bin/Makefile.am              |    5 +++--
 configure.ac                 |   14 +++++++-------
 share/doc/build/Makefile.am  |    4 ++--
 src/couchdb/priv/Makefile.am |    5 +++--
 4 files changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/70693b8e/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index c5a4b54..5770e20 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -115,9 +115,10 @@ HELP2MAN_OPTION=--no-info --help-option="-h" --version-option="-V"
 # XXX: the man pages.
 
 couchdb.1: couchdb.tpl.in
-	touch $@
-	if test -x "$(HELP2MAN)"; then \
+	if test -n "$(HAS_HELP2MAN)"; then \
 	    $(MAKE) -f Makefile couchdb; \
 	    $(HELP2MAN) $(HELP2MAN_OPTION) \
 	        --name="Apache CouchDB database server" ./couchdb --output $@; \
+	else \
+	    touch $@; \
 	fi

http://git-wip-us.apache.org/repos/asf/couchdb/blob/70693b8e/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 9b6c027..df6d577 100644
--- a/configure.ac
+++ b/configure.ac
@@ -535,7 +535,7 @@ if test "$use_launchd" = "yes"; then
     fi
 fi
 
-AM_MISSING_PROG([HELP2MAN], [help2man])
+AC_PATH_PROG([HELP2MAN], [help2man])
 
 if test x${HELP2MAN} = x; then
     if test x${strictness_enabled} = xyes; then
@@ -545,7 +545,7 @@ if test x${HELP2MAN} = x; then
     fi
 fi
 
-AM_MISSING_PROG([SPHINX_BUILD], [sphinx-build])
+AC_PATH_PROG([SPHINX_BUILD], [sphinx-build])
 
 if test x${SPHINX_BUILD} = x; then
     if test x${strictness_enabled} = xyes; then
@@ -561,9 +561,9 @@ else
     AX_PYTHON_MODULE([pygments])
 fi
 
-AM_MISSING_PROG([PDFLATEX], [pdflatex])
+AC_CHECK_PROG([HAS_PDFLATEX], [pdflatex], [yes])
 
-if test x${PDFLATEX} = x; then
+if test x${HAS_PDFLATEX} = x; then
     if test x${strictness_enabled} = xyes; then
         AC_MSG_ERROR([Could not find the `pdflatex' executable.
     
@@ -573,11 +573,11 @@ Is LaTeX installed?])
     fi
 fi
 
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_CHECK_PROG([HAS_MAKEINFO], [makeinfo], [yes])
 
-if test x${MAKEINFO} = x; then
+if test x${HAS_MAKEINFO} = x; then
     if test x${strictness_enabled} = xyes; then
-        AC_MSG_ERROR([Could not find the `pdflatex' executable.
+        AC_MSG_ERROR([Could not find the `makeinfo' executable.
     
 Is GNU Texinfo installed?])
     else

http://git-wip-us.apache.org/repos/asf/couchdb/blob/70693b8e/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 27c0090..38a6aba 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -189,7 +189,7 @@ $(texinfo_files): texinfo.stamp
 texinfo.stamp: $(image_files) $(src_files)
 	@rm -f texinfo.tmp
 	@touch texinfo.tmp
-	if test -x "$(SPHINX_BUILD)" -a -x "$(MAKEINFO)"; then \
+	if test -x "$(SPHINX_BUILD)" -a -n "$(HAS_MAKEINFO)"; then \
 	    $(SPHINX_BUILD) -b texinfo $(SPHINXOPTS) $(builddir)/texinfo; \
 	else \
 	    touch $(texinfo_files); \
@@ -205,7 +205,7 @@ $(pdf_files): pdf.stamp
 pdf.stamp: $(image_files) $(src_files)
 	@rm -f pdf.tmp
 	@touch pdf.tmp
-	if test -x "$(SPHINX_BUILD)" -a -x "$(PDFLATEX)"; then \
+	if test -x "$(SPHINX_BUILD)" -a -n "$(HAS_PDFLATEX)"; then \
 	    $(SPHINX_BUILD) -b latex $(SPHINXOPTS) $(builddir)/latex; \
 	    $(MAKE) -C latex all-pdf; \
 	    gzip -9 < latex/CouchDB.pdf > latex/CouchDB.pdf.gz; \

http://git-wip-us.apache.org/repos/asf/couchdb/blob/70693b8e/src/couchdb/priv/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 27d48f3..3f5b5c5 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -67,10 +67,11 @@ couchpriv_PROGRAMS = couchspawnkillable
 HELP2MAN_OPTION=--no-info --help-option="-h" --version-option="-V"
 
 couchjs.1: couchjs
-	touch $@
-	if test -x "$(HELP2MAN)"; then \
+	if test -n "$(HAS_HELP2MAN)"; then \
 	    $(HELP2MAN) $(HELP2MAN_OPTION) \
 	        --name="$(package_name) JavaScript interpreter" ./couchjs --output $@; \
+	else \
+	    touch $@; \
 	fi
 
 %.cfg: %.cfg.in


Mime
View raw message