From 0bf4319f2049b2a160c2e6bfdbf3851e0485114b Mon Sep 17 00:00:00 2001
From:  <sylvain@sylvain.(none)>
Date: Wed, 31 Aug 2005 01:39:41 -0400
Subject: [PATCH] Rectification to the documentation installation Info dir
 entry is now correctly uptated.

---
 doc/Makefile.am      | 2 +-
 doc/Makefile.dist.in | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index c20ea37..fb78d51 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,7 +16,7 @@ adesklets_htmldoc-$(VERSION).tar.bz2: adesklets_en.texi adesklets_fr.texi
 	xargs --max-lines=1 basename | \
 	sed 's/__init__.py/adesklets/;/__init__.py/!s/\(.*\).py/adesklets.\1/' | \
 	xargs --max-lines=1 env PYTHONPATH=`pwd`/../../../scripting/python \
-		python /usr/bin/pydoc -w
+		python </dev/null /usr/bin/pydoc -w
 	cd html/pydoc && \
 	ls *.html | \
 	xargs --max-lines=1 \
diff --git a/doc/Makefile.dist.in b/doc/Makefile.dist.in
index fb143e4..a01e5d4 100644
--- a/doc/Makefile.dist.in
+++ b/doc/Makefile.dist.in
@@ -15,6 +15,13 @@ all:
 install:
 	$(install) adesklets.info $(DESTDIR)/$(infodir)
 	$(install) adesklets_fr.info $(DESTDIR)/$(infodir)
+	@if (install-info --version && \
+             install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+          for file in adesklets_en.info adesklets_fr.info; do \
+            echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$file'";\
+            install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$file" || :;\
+          done; \
+        else : ; fi
 	$(install) adesklets.1 $(DESTDIR)/$(man1dir)
 	$(install) adesklets_checkin.1 $(DESTDIR)/$(man1dir)
 	$(install) adesklets_submit.1 $(DESTDIR)/$(man1dir)
-- 
2.11.4.GIT