From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PkgU2-0002Sn-Bx for garchives@archives.gentoo.org; Wed, 02 Feb 2011 17:27:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00563E099C; Wed, 2 Feb 2011 17:27:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BB3BBE078D for ; Wed, 2 Feb 2011 17:27:02 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29AD71B4023 for ; Wed, 2 Feb 2011 17:27:02 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2178) id B927820054; Wed, 2 Feb 2011 17:27:00 +0000 (UTC) From: "Ulrich Mueller (ulm)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ulm@gentoo.org Subject: [gentoo-commits] gentoo commit in src/patchsets/emacs/22.3: 09_all_info-dir.patch X-VCS-Repository: gentoo X-VCS-Files: 09_all_info-dir.patch X-VCS-Directories: src/patchsets/emacs/22.3 X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller Content-Type: text/plain; charset=utf8 Message-Id: <20110202172700.B927820054@flycatcher.gentoo.org> Date: Wed, 2 Feb 2011 17:27:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 56c8cb595edd345095d48aa0a0f72876 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=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/emacs/22= .3/09_all_info-dir.patch?rev=3D1.1&content-type=3Dtext/plain Index: 09_all_info-dir.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D7942 Backported to Emacs 22. --- emacs-22.3-orig/Makefile.in +++ emacs-22.3/Makefile.in @@ -504,29 +504,24 @@ thisdir=3D`/bin/pwd`; \ if [ `(cd ${srcdir}/info && /bin/pwd)` !=3D `(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=3D`/bin/pwd`; \ - if [ `(cd ${srcdir}/info && /bin/pwd)` !=3D `(cd $(DESTDIR)${infodir} &= & /bin/pwd)` ]; \ - then \ - for elt in $(INFO_FILES); do \ - (cd $${thisdir}; \ - ${INSTALL_INFO} --info-dir=3D$(DESTDIR)${infodir} $(DESTDIR)${info= dir}/$$elt); \ - done; \ + done; \ + cd $(DESTDIR)${infodir}; \ + if [ -f dir ]; then \ + for elt in $(INFO_FILES); do \ + (cd $${thisdir}; \ + ${INSTALL_INFO} --info-dir=3D$(DESTDIR)${infodir} $(DESTDIR)${infodi= r}/$$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=3D`/bin/pwd`; \