(Fcall_process): Don't clobber new_argv[0]

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 9a137b2e0dfe53bad79088ca4f0870554e9486fa..7f6f6a293ef66490f91225abd727b1b5ba6bd5c4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -219,6 +219,9 @@ paths-force: FRC
          -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') &&                \
        ${srcdir}/move-if-change paths.h.$$$$ src/paths.h
 
+# For parallel make, src should be build before leim.
+leim:   src
+
 src:   lib-src FRC
 
 lib-src: FRC src/config.stamp
@@ -277,7 +280,7 @@ leim/Makefile: leim/Makefile.in config.status
 ## source exists and is distinct from the destination.
 ### We do install-arch-indep first because
 ### the executable needs the Lisp files and DOC file to work properly.
-install: all install-arch-indep install-arch-dep blessmail install-leim
+install: all install-arch-indep install-arch-dep install-leim blessmail
        @true
 
 ### Install the executables that were compiled specifically for this machine.
@@ -342,6 +345,7 @@ install-arch-indep: mkdir
           (cd $(docdir); chmod a+r DOC*; rm DOC) \
        else true; fi
        if [ -r ./lisp ] \
+          && [ -r ./lisp/simple.el ] \
           && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
           && [ x`(cd ${srcdir}/lisp; /bin/pwd)` != x`(cd ./lisp; /bin/pwd)` ]; \
        then \
@@ -360,7 +364,7 @@ install-arch-indep: mkdir
           cd ${srcdir}/info ; \
           (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
           (cd $${thisdir}; chmod a+r ${infodir}/dir); \
-          for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip*; do \
+          for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip* widget*; do \
             (cd $${thisdir}; \
              ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
              chmod a+r ${infodir}/$$f); \
@@ -378,7 +382,7 @@ install-arch-indep: mkdir
 ### have separate target here instead of including it in
 ### `install-arch-indep'.  People who extracted LEIM files after they
 ### insalled Emacs itself can install only LEIM files by this target.
-install-leim: leim/Makefile
+install-leim: leim/Makefile mkdir
        cd leim; $(MAKE) install
 
 ### Build Emacs and install it, stripping binaries while installing them.
@@ -522,7 +526,7 @@ SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in PROBLEMS \
 .PHONY: unlock relock
 
 unlock:
-       chmod u+w $(SOURCES) cpp/*
+       chmod u+w $(SOURCES)
        -(cd elisp; chmod u+w Makefile README *.texi)
        (cd etc; $(MAKE) $(MFLAGS) unlock)
        (cd lib-src; $(MAKE) $(MFLAGS) unlock)
@@ -534,7 +538,7 @@ unlock:
        (cd src; $(MAKE) $(MFLAGS) unlock)
 
 relock:
-       chmod u-w $(SOURCES) cpp/*
+       chmod u-w $(SOURCES)
        -(cd elisp; chmod u-w Makefile README *.texi)
        (cd etc; $(MAKE) $(MFLAGS) relock)
        (cd lib-src; $(MAKE) $(MFLAGS) relock)
@@ -546,10 +550,9 @@ relock:
        (cd src; $(MAKE) $(MFLAGS) relock)
 
 TAGS tags:     lib-src src
-       export EMACSDIR; EMACSDIR=`pwd`/src; \
-       export EMACS;  EMACS=`pwd`/src/emacs; \
-       cd ${srcdir}/src; \
-       $(MAKE) tags -f $$EMACSDIR/Makefile
+       # The src subdir knows how to do the right thing
+       # even when the build directory and source dir are different.
+       cd src; $(MAKE) tags
 
 check:
        @echo "We don't have any tests for GNU Emacs yet."