couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject git commit: Fix for how we handle man pages
Date Sat, 24 Nov 2012 18:06:51 GMT
Updated Branches:
  refs/heads/docs 726896891 -> 66cbc19c3


Fix for how we handle man pages


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

Branch: refs/heads/docs
Commit: 66cbc19c35c9b490c7053b7195525a678a134341
Parents: 7268968
Author: Noah Slater <nslater@apache.org>
Authored: Sat Nov 24 18:06:44 2012 +0000
Committer: Noah Slater <nslater@apache.org>
Committed: Sat Nov 24 18:06:44 2012 +0000

----------------------------------------------------------------------
 DEVELOPERS                   |    3 +++
 bin/Makefile.am              |    5 ++---
 configure.ac                 |    4 ++--
 src/couchdb/priv/Makefile.am |   12 ++++++------
 4 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/66cbc19c/DEVELOPERS
----------------------------------------------------------------------
diff --git a/DEVELOPERS b/DEVELOPERS
index a3a0d92..0f58038 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -40,6 +40,9 @@ You can install the dependencies by running:
     sudo apt-get install autoconf
     sudo apt-get install autoconf-archive
     sudo apt-get install pkg-config
+    
+Optional dependencies:
+    
     sudo apt-get install python-sphinx 
     sudo apt-get install texlive-latex-base
     sudo apt-get install texlive-latex-recommended

http://git-wip-us.apache.org/repos/asf/couchdb/blob/66cbc19c/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 24dab60..1bfb6dc 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -110,11 +110,10 @@ couch-config_dev: couch-config.tpl
 
 HELP2MAN_OPTION=--no-info --help-option="-h" --version-option="-V"
 
-# Because the scripts are made at build time for the user we need to depend on
-# the original templates so as not to cause the rebuilding of the man pages.
+# Depend on source files so distributed man pages are not rebuilt for end user.
 
 couchdb.1: couchdb.tpl.in
 	$(MAKE) -f Makefile couchdb; \
 	$(top_srcdir)/build-aux/missing --run \
 	    help2man $(HELP2MAN_OPTION) \
-	    --name="Apache CouchDB database server" ./couchdb --output $@
\ No newline at end of file
+	    --name="$(package_name) database server" ./couchdb --output $@

http://git-wip-us.apache.org/repos/asf/couchdb/blob/66cbc19c/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index a8004d8..e908933 100644
--- a/configure.ac
+++ b/configure.ac
@@ -541,7 +541,7 @@ if test x${HAS_HELP2MAN} = x; then
     if test x${strictness_enabled} = xyes; then
         AC_MSG_ERROR([Could not find the `help2man' executable.])
     else
-        AC_MSG_WARN([You will be unable to regenerate any man pages.])
+        AC_MSG_WARN([You will be unable to regenerate man pages.])
     fi
 fi
 
@@ -587,7 +587,7 @@ if test x${HAS_SPHINX_BUILD} = x; then
     if test x${strictness_enabled} = xyes; then
         AC_MSG_ERROR([Could not find the `sphinx-build' executable.])
     else
-        AC_MSG_WARN([You will be unable to regenerate any documentation.])
+        AC_MSG_WARN([You will be unable to regenerate documentation.])
     fi
 fi
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/66cbc19c/src/couchdb/priv/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 49fb1e3..2a0cf47 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -66,13 +66,13 @@ couchpriv_PROGRAMS = couchspawnkillable
 
 HELP2MAN_OPTION=--no-info --help-option="-h" --version-option="-V"
 
-couchjs.1: couchjs
-	if test -n "`which help2man`"; then \
+# Depend on source files so distributed man pages are not rebuilt for end user.
+
+couchjs.1: $COUCHJS_SRCS
+	$(MAKE) -f Makefile couchjs; \
+	$(top_srcdir)/build-aux/missing --run \
 	    help2man $(HELP2MAN_OPTION) \
-	        --name="$(package_name) JavaScript interpreter" ./couchjs --output $@; \
-	else \
-	    $(top_srcdir)/build-aux/missing help2man && exit 1; \
-	fi
+	    --name="$(package_name) JavaScript interpreter" ./couchjs --output $@
 
 %.cfg: %.cfg.in
 	cp $< $@


Mime
View raw message