[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108093: Don't hard-code the list of
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108093: Don't hard-code the list of info files in the top-level Makefile |
Date: |
Wed, 02 May 2012 00:45:16 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 108093
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-02 00:45:16 -0700
message:
Don't hard-code the list of info files in the top-level Makefile
The sed '/ing directory/d' piece is to remove the annoying
"entering/leaving directory" messages that GNU make insists on
printing when called recursively. --no-print-directory isn't portable.
* Makefile.in (INFO_FILES): Remove variable.
(INFO_NONMISC): New variable.
(install-arch-indep, uninstall): Don't use $INFO_FILES.
* doc/misc/Makefile.in (echo-info): New phony target, used by top-level.
modified:
ChangeLog
Makefile.in
doc/misc/ChangeLog
doc/misc/Makefile.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-02 07:20:29 +0000
+++ b/ChangeLog 2012-05-02 07:45:16 +0000
@@ -1,5 +1,9 @@
2012-05-02 Glenn Morris <address@hidden>
+ * Makefile.in (INFO_FILES): Remove variable.
+ (INFO_NONMISC): New variable.
+ (install-arch-indep, uninstall): Don't use $INFO_FILES.
+
* Makefile.in (uninstall): Remove useless-use-of-for; that for
some reason caused problems on an old Solaris.
=== modified file 'Makefile.in'
--- a/Makefile.in 2012-05-02 07:20:29 +0000
+++ b/Makefile.in 2012-05-02 07:45:16 +0000
@@ -126,17 +126,10 @@
address@hidden@
man1dir=$(mandir)/man1
-# Where to install and expect the info files describing Emacs. In the
-# past, this defaulted to a subdirectory of ${prefix}/lib/emacs, but
-# since there are now many packages documented with the texinfo
-# system, it is inappropriate to imply that it is part of Emacs.
+# Where to install and expect the info files describing Emacs.
address@hidden@
-INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \
- ede ediff edt eieio efaq eintr elisp emacs emacs-gnutls \
- emacs-mime epa erc ert eshell eudc flymake forms gnus \
- idlwave info mairix-el message mh-e newsticker nxml-mode \
- org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses \
- sieve smtpmail speedbar tramp url vip viper widget woman
+# Info files not in the doc/misc directory (we get those via make echo-info).
+INFO_NONMISC=emacs eintr elisp
# If no makeinfo was found and configured --without-makeinfo, "no"; else "yes".
address@hidden@
@@ -617,8 +610,9 @@
${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \
chmod a+r $(DESTDIR)${infodir}/dir); \
fi; \
+ info_misc=`cd $${thisdir}/doc/misc; ${MAKE} echo-info | sed '/ing
directory/d'`; \
cd ${srcdir}/info ; \
- for elt in $(INFO_FILES); do \
+ for elt in ${INFO_NONMISC} $${info_misc}; do \
test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
(cd $${thisdir}; \
@@ -718,8 +712,9 @@
done
-rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
thisdir=`/bin/pwd`; \
- (cd $(DESTDIR)${infodir} && \
- for elt in $(INFO_FILES); do \
+ (info_misc=`cd doc/misc; ${MAKE} echo-info | sed '/ing directory/d'`; \
+ cd $(DESTDIR)${infodir} && \
+ for elt in ${INFO_NONMISC} $${info_misc}; do \
(cd $${thisdir}; \
$(INSTALL_INFO) --remove --info-dir=$(DESTDIR)${infodir}
$(DESTDIR)${infodir}/$$elt); \
if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2012-05-02 07:20:29 +0000
+++ b/doc/misc/ChangeLog 2012-05-02 07:45:16 +0000
@@ -1,5 +1,7 @@
2012-05-02 Glenn Morris <address@hidden>
+ * Makefile.in (echo-info): New phony target, used by top-level.
+
* viper.texi: Make direntry shorter (also it is no longer "newest").
* emacs-gnutls.texi, ert.texi, org.texi:
=== modified file 'doc/misc/Makefile.in'
--- a/doc/misc/Makefile.in 2012-04-14 01:46:06 +0000
+++ b/doc/misc/Makefile.in 2012-05-02 07:45:16 +0000
@@ -43,7 +43,6 @@
MAKEINFO = @MAKEINFO@
MAKEINFO_OPTS = --force -I$(emacsdir)
-# Also add new entries to INFO_FILES in the top-level Makefile.in.
INFO_TARGETS = \
$(infodir)/ada-mode \
$(infodir)/auth \
@@ -210,7 +209,11 @@
mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d
${infodir}
-.PHONY: info dvi pdf
+.PHONY: info dvi pdf echo-info
+
+## Used by top-level Makefile.
+echo-info:
+ @echo $(INFO_TARGETS) | sed 's|[^ ]*/||g'
info: $(INFO_TARGETS)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108093: Don't hard-code the list of info files in the top-level Makefile,
Glenn Morris <=