(leim): Don't put PARALLEL in environment.

($(srcdir)/src/config.in, $(srcdir)/src/stamp-h.in): New.
(install-arch-indep, install-arch-indep): Merge changes from
trunk.

1 files changed, 19 insertions, 8 deletions

diff --git a/Makefile.in b/Makefile.in
index cdeb42af2c1..4d95f791db4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 # DIST: that first.
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#  2000, 2001 Free Software Foundation, Inc.
+#  2000, 2001, 2002 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -210,8 +210,7 @@ EMACS = `echo emacs | sed '$(TRANSFORM)'`
 EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`
 
 # Subdirectories to make recursively.  `lisp' is not included
-# because the compiled lisp files are part of the distribution
-# and you cannot remake them without installing Emacs first.
+# because the compiled lisp files are part of the distribution.
 # leim is not included because it needs special handling.
 SUBDIR = lib-src src
 
@@ -252,9 +251,9 @@ epaths-force: FRC
 # running more than 1 process in the leim directory, especially for
 # the $TIT files there.
 leim:   src ${SUBDIR_MAKEFILES} FRC
-        (export PARALLEL; PARALLEL=0; cd $@; $(MAKE) all $(MFLAGS) \
+        cd $@; $(MAKE) PARALLEL=0 all $(MFLAGS) \
           CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
-          LDFLAGS='${LDFLAGS}' MAKE='${MAKE}')
+          LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
 
 src:    lib-src FRC
 
@@ -280,6 +279,13 @@ config.status: ${srcdir}/configure
 ${srcdir}/configure: configure.in
         cd ${srcdir} && autoconf
 
+$(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
+        @true
+$(srcdir)/src/stamp-h.in: $(MAINT)
+        cd ${srcdir} && autoheader
+        rm -f $(srcdir)/src/stamp-h.in
+        echo timestamp > $(srcdir)/src/stamp-h.in
+
 src/Makefile: $(srcdir)/src/Makefile.in config.status
         ./config.status
 
@@ -356,6 +362,9 @@ install-arch-dep: mkdir
 
 ## Note that we copy DOC* and then delete DOC
 ## as a workaround for a bug in tar on Ultrix 4.2.
+
+## If people complain about the h flag in tar command, take that out.
+## That flag is also used in leim/Makefile.in
 install-arch-indep: mkdir info
         -set ${COPYDESTS} ; \
         unset CDPATH; \
@@ -377,6 +386,7 @@ install-arch-indep: mkdir info
               (cd $${dir}; tar -chf - . ) \
                 | (cd $${dest}; umask 022; \
                    tar -xvf - && cat > /dev/null) || exit 1; \
+              find $${dest} -exec chown $$LOGNAME {} ';' ;\
               for subdir in `find $${dest} -type d ! -name RCS ! -name CVS -print` ; do \
                 chmod a+rx $${subdir} ; \
                 rm -rf $${subdir}/RCS ; \
@@ -414,8 +424,8 @@ install-arch-indep: mkdir info
         then \
            echo "Copying etc/DOC-* to ${docdir} ..." ; \
            (cd ./etc; tar -chf - DOC*) \
-             |(cd ${docdir}; umask 0; tar -xvf - && cat > /dev/null) || exit 1; \
-           (cd $(docdir); chmod a+r DOC*; rm DOC); \
+             |(cd ${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
+           (cd $(docdir); chown $${LOGNAME} DOC*; chmod a+r DOC*; rm DOC); \
         else true; fi
         -unset CDPATH; \
         if [ -r ./lisp ] \
@@ -425,7 +435,8 @@ install-arch-indep: mkdir info
         then \
            echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \
            (cd lisp; tar -chf - *.el *.elc) \
-             |(cd ${lispdir}; umask 0; tar -xvf - && cat > /dev/null) || exit 1; \
+             |(cd ${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
+           (cd ${lispdir}; find . -exec chown $${LOGNAME} {} ';') ; \
         else true; fi
         -unset CDPATH; \
         thisdir=`/bin/pwd`; \