mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from trunk after 24.3 was moved to emacs-24 branch.

Browse source
This commit is contained in:
Eli Zaretskii 2012-11-02 11:00:44 +02:00
commit 5ade42a511
250 changed files with 7049 additions and 6396 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib-src/ChangeLog
View file

@ -1,3 +1,19 @@
2012-10-26 Glenn Morris <rgm@gnu.org>
* Makefile.in (uninstall): No INSTALLABLES live in archlibdir.
* Makefile.in (install, uninstall): Transformations should not be
applied to $EXEEXT.
2012-10-23 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (lisp2): Add cp51932.el and eucjp-ms.el, to
follow src/lisp.mk.
2012-10-21 Glenn Morris <rgm@gnu.org>
* make-docfile.c (scan_lisp_file): Add cp51932.el and eucjp-ms.el.
2012-10-20 Eli Zaretskii <eliz@gnu.org>
* make-docfile.c (IS_SLASH, DEF_ELISP_FILE): New macros.

13
lib-src/Makefile.in
View file

@ -244,20 +244,21 @@ install: $(DESTDIR)${archlibdir}
@echo "Installing utilities for users to run."
umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
for file in ${INSTALLABLES} ; do \
$(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
$(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
done
for file in ${INSTALLABLE_SCRIPTS} ; do \
$(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
done
uninstall:
(cd $(DESTDIR)${bindir}; \
for file in ${INSTALLABLES} ${INSTALLABLE_SCRIPTS}; do \
for file in ${INSTALLABLES}; do \
rm -f $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
done
for file in ${INSTALLABLE_SCRIPTS}; do \
rm -f $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
done)
done
if [ -d $(DESTDIR)${archlibdir} ]; then \
(cd $(DESTDIR)${archlibdir} && \
rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}) \
(cd $(DESTDIR)${archlibdir} && rm -f ${UTILITIES} ${SCRIPTS}) \
fi
mostlyclean:

4
lib-src/make-docfile.c
View file

@ -1118,7 +1118,9 @@ scan_lisp_file (const char *filename, const char *mode)
} const uncompiled[] = {
DEF_ELISP_FILE (loaddefs.el),
DEF_ELISP_FILE (loadup.el),
DEF_ELISP_FILE (charprop.el)
DEF_ELISP_FILE (charprop.el),
DEF_ELISP_FILE (cp51932.el),
DEF_ELISP_FILE (eucjp-ms.el)
};
int i, match;
size_t flen = strlen (filename);

2
lib-src/makefile.w32-in
View file

@ -229,6 +229,8 @@ lisp2 = \
$(lispsource)language/greek.elc \
$(lispsource)language/hebrew.elc \
$(lispsource)language/japanese.elc \
$(lispsource)international/cp51932.el \
$(lispsource)international/eucjp-ms.el \
$(lispsource)language/korean.elc \
$(lispsource)language/lao.elc \
$(lispsource)language/cham.elc \