From: "Ulrich Mueller (ulm)" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo commit in src/patchsets/emacs/22.3: 09_all_info-dir.patch
Date: Wed, 2 Feb 2011 17:27:00 +0000 (UTC) [thread overview]
Message-ID: <20110202172700.B927820054@flycatcher.gentoo.org> (raw)
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`; \
reply other threads:[~2011-02-02 17:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110202172700.B927820054@flycatcher.gentoo.org \
--to=ulm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox