*** empty log message ***

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7ed696c..4d95f79 100644 (file)
--- 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
 
@@ -227,7 +226,7 @@ SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile lispref/Makefile lispintro/Make
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
 
-all: maybe_bootstrap ${SUBDIR} leim
+all: ${SUBDIR} leim
 
 removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
 
@@ -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
 
@@ -262,7 +261,7 @@ lib-src: FRC src/config.stamp
 
 .RECURSIVE: ${SUBDIR} leim
 
-${SUBDIR}: ${SUBDIR_MAKEFILES} FRC
+${SUBDIR}: maybe_bootstrap ${SUBDIR_MAKEFILES} FRC
        cd $@; $(MAKE) all $(MFLAGS) \
          CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
          LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
@@ -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`; \
@@ -695,8 +706,7 @@ maybe_bootstrap:
        @if [ ! -f $(srcdir)/lisp/abbrev.elc ]; then \
          echo "Essential Lisp files seem to be missing.  You should either"; \
          echo "do \`make bootstrap' or create \`lisp/abbrev.elc' somehow.";    \
-         echo "This Make job will now hang till you kill it."; \
-         while true; do sleep 10; done; \
+         exit 1;\
        fi
 
 bootstrap: bootstrap-clean-before bootstrap-lisp-1 bootstrap-src bootstrap-lisp bootstrap-clean-after all info