You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2012/11/25 22:04:12 UTC

git commit: I am THIS close to abandoning info support. Stupid format nobody uses with even more stupid tooling. Seriously. THIS close.

Updated Branches:
  refs/heads/docs 05c933b80 -> 481a5d1c5


I am THIS close to abandoning info support. Stupid format nobody uses with even more stupid tooling. Seriously. THIS close.


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

Branch: refs/heads/docs
Commit: 481a5d1c53605d0f35d4f8cbb7248226ddf1cb0b
Parents: 05c933b
Author: Noah Slater <ns...@apache.org>
Authored: Sun Nov 25 21:04:06 2012 +0000
Committer: Noah Slater <ns...@apache.org>
Committed: Sun Nov 25 21:04:06 2012 +0000

----------------------------------------------------------------------
 share/doc/build/Makefile.am |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/481a5d1c/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index f5f1ced..8989d71 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -257,8 +257,9 @@ install-data-local:
 	        $(info_file_dist) $(DESTDIR)$(infodir)/$(info_file_inst); \
 	    if test -n "`which install-info`"; then \
 	        install-info \
-	            --info-dir=$(DESTDIR)$(infodir) \
-	            $(DESTDIR)$(infodir)/$(info_file_inst); \
+	            $(DESTDIR)$(infodir)/$(info_file_inst) \
+	            $(DESTDIR)$(infodir)/dir \
+	        || true; \
 	    fi \
 	fi
 	if test -s $(pdf_file_dist); then \
@@ -278,7 +279,11 @@ uninstall-local:
 	rm -f $(DESTDIR)$(infodir)/$(info_file_inst)
 	if test -d $(DESTDIR)$(infodir); then \
 	    if test -n "`which install-info`"; then\
-	        install-info --delete --info-dir=$(DESTDIR)$(infodir) $(info_file_inst) ; \
+	        install-info \
+	            --delete \
+	            $(DESTDIR)$(infodir)/$(info_file_inst) \
+	            $(DESTDIR)$(infodir)/dir \
+	        || true; \
 	    fi \
 	fi
 	rm -f $(DESTDIR)$(localdocdir)/$(pdf_file_inst)