public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [gentoo-commits] gentoo commit in src/patchsets/emacs/22.3: 09_all_info-dir.patch
@ 2011-02-02 17:27 99% Ulrich Mueller (ulm)
  0 siblings, 0 replies; 1+ results
From: Ulrich Mueller (ulm) @ 2011-02-02 17:27 UTC (permalink / raw
  To: gentoo-commits

ulm         11/02/02 17:27:00

  Added:                09_all_info-dir.patch
  Log:
  Fix an issue with duplicate items in GNU Info directory.

Revision  Changes    Path
1.1                  src/patchsets/emacs/22.3/09_all_info-dir.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/emacs/22.3/09_all_info-dir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/emacs/22.3/09_all_info-dir.patch?rev=1.1&content-type=text/plain

Index: 09_all_info-dir.patch
===================================================================
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7942
Backported to Emacs 22.

--- emacs-22.3-orig/Makefile.in
+++ emacs-22.3/Makefile.in
@@ -504,29 +504,24 @@
 	thisdir=`/bin/pwd`; \
 	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
 	then \
-	  (cd $(DESTDIR)${infodir};  \
-	   if [ -f dir ]; then true; \
-	   else	\
-	     (cd $${thisdir}; \
-	      ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \
-	      chmod a+r $(DESTDIR)${infodir}/dir); \
-	   fi; \
-	   cd ${srcdir}/info ; \
+	  (cd ${srcdir}/info ; \
 	   for elt in $(INFO_FILES); do \
 	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
 	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
 	        chmod a+r $(DESTDIR)${infodir}/$$f; \
 	      done; \
-	   done); \
-	else true; fi
-	-unset CDPATH; \
-	thisdir=`/bin/pwd`; \
-	if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
-	then \
-	  for elt in $(INFO_FILES); do \
-	    (cd $${thisdir}; \
-	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
-	  done; \
+	   done; \
+	   cd $(DESTDIR)${infodir};  \
+	   if [ -f dir ]; then \
+	      for elt in $(INFO_FILES); do \
+		 (cd $${thisdir}; \
+		  ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
+	      done; \
+	   else	\
+	     (cd $${thisdir}; \
+	      ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \
+	      chmod a+r $(DESTDIR)${infodir}/dir); \
+	   fi); \
 	else true; fi
 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
 	thisdir=`/bin/pwd`; \






^ permalink raw reply	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2011-02-02 17:27 99% [gentoo-commits] gentoo commit in src/patchsets/emacs/22.3: 09_all_info-dir.patch Ulrich Mueller (ulm)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox