[Emacs-diffs] /srv/bzr/emacs/trunk r107805: Small changes for top-level Makefile

[Glenn Morris]

------------------------------------------------------------
revno: 107805
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2012-04-08 23:40:20 -0700
message:
  Small changes for top-level Makefile
  
  * Makefile.in (leim): Check cd return value.  Pass fewer variables.
  (install-leim): Check cd return value.  Pass $MFLAGS.
  (install-strip): Pass $MFLAGS.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-04-09 00:50:17 +0000
+++ b/ChangeLog 2012-04-09 06:40:20 +0000
@@ -1,5 +1,9 @@
 2012-04-09  Glenn Morris  <address@hidden>
 
+       * Makefile.in (leim): Check cd return value.  Pass fewer variables.
+       (install-leim): Check cd return value.  Pass $MFLAGS.
+       (install-strip): Pass $MFLAGS.
+
        * configure.in: Require makeinfo >= 4.7.  (Bug#10910)
        Eg org.texi has been using 4.7 functions for some time.
 

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-02-04 22:27:28 +0000
+++ b/Makefile.in       2012-04-09 06:40:20 +0000
@@ -2,7 +2,7 @@
 # DIST: make most of the changes to this file you might want, so try
 # DIST: that first.
 
-# Copyright (C) 1992-2012  Free Software Foundation, Inc.
+# Copyright (C) 1992-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -309,9 +309,7 @@
 # running more than 1 process in the leim directory, especially for
 # the $TIT files there.
 leim:   src Makefile FRC
-       (export PARALLEL; PARALLEL=0; cd $@; $(MAKE) all $(MFLAGS) \
-         CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
-         LDFLAGS='${LDFLAGS}' MAKE='${MAKE}')
+       cd leim && PARALLEL=0 $(MAKE) all $(MFLAGS)
 
 lib-src src: lib
 
@@ -670,11 +668,11 @@
 ### `install-arch-indep'.  People who extracted LEIM files after they
 ### installed Emacs itself can install only LEIM files by this target.
 install-leim: leim/Makefile mkdir
-       cd leim; $(MAKE) install
+       cd leim && $(MAKE) $(MFLAGS) install
 
 ### Build Emacs and install it, stripping binaries while installing them.
 install-strip:
-       $(MAKE) INSTALL_STRIP=-s install
+       $(MAKE) $(MFLAGS) INSTALL_STRIP=-s install
 
 ### Build all the directories we're going to install Emacs in. Since
 ### we may be creating several layers of directories (for example,