1 |
ulm 11/02/02 17:27:00 |
2 |
|
3 |
Added: 09_all_info-dir.patch |
4 |
Log: |
5 |
Fix an issue with duplicate items in GNU Info directory. |
6 |
|
7 |
Revision Changes Path |
8 |
1.1 src/patchsets/emacs/22.3/09_all_info-dir.patch |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/emacs/22.3/09_all_info-dir.patch?rev=1.1&view=markup |
11 |
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 |
12 |
|
13 |
Index: 09_all_info-dir.patch |
14 |
=================================================================== |
15 |
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7942 |
16 |
Backported to Emacs 22. |
17 |
|
18 |
--- emacs-22.3-orig/Makefile.in |
19 |
+++ emacs-22.3/Makefile.in |
20 |
@@ -504,29 +504,24 @@ |
21 |
thisdir=`/bin/pwd`; \ |
22 |
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \ |
23 |
then \ |
24 |
- (cd $(DESTDIR)${infodir}; \ |
25 |
- if [ -f dir ]; then true; \ |
26 |
- else \ |
27 |
- (cd $${thisdir}; \ |
28 |
- ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \ |
29 |
- chmod a+r $(DESTDIR)${infodir}/dir); \ |
30 |
- fi; \ |
31 |
- cd ${srcdir}/info ; \ |
32 |
+ (cd ${srcdir}/info ; \ |
33 |
for elt in $(INFO_FILES); do \ |
34 |
for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ |
35 |
${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \ |
36 |
chmod a+r $(DESTDIR)${infodir}/$$f; \ |
37 |
done; \ |
38 |
- done); \ |
39 |
- else true; fi |
40 |
- -unset CDPATH; \ |
41 |
- thisdir=`/bin/pwd`; \ |
42 |
- if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \ |
43 |
- then \ |
44 |
- for elt in $(INFO_FILES); do \ |
45 |
- (cd $${thisdir}; \ |
46 |
- ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ |
47 |
- done; \ |
48 |
+ done; \ |
49 |
+ cd $(DESTDIR)${infodir}; \ |
50 |
+ if [ -f dir ]; then \ |
51 |
+ for elt in $(INFO_FILES); do \ |
52 |
+ (cd $${thisdir}; \ |
53 |
+ ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ |
54 |
+ done; \ |
55 |
+ else \ |
56 |
+ (cd $${thisdir}; \ |
57 |
+ ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \ |
58 |
+ chmod a+r $(DESTDIR)${infodir}/dir); \ |
59 |
+ fi); \ |
60 |
else true; fi |
61 |
-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir} |
62 |
thisdir=`/bin/pwd`; \ |