(xg_separator_p) <separator_names>: Move to file scope.

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 66cc0f342ca6fb7005ca45b2e25cbf62434c6d71..acf865239ff8a678588054dbeb68023783594f80 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -420,6 +420,9 @@ install-arch-dep: mkdir
 
 ## If people complain about the h flag in tar command, take that out.
 ## That flag is also used in leim/Makefile.in
+
+## Note that the Makefiles in the etc directory are potentially useful
+## in an installed Emacs, so should not be excluded.
 install-arch-indep: mkdir info
        -set ${COPYDESTS} ; \
        unset CDPATH; \
@@ -452,7 +455,8 @@ install-arch-indep: mkdir info
                rm -f  $${subdir}/.\#* ; \
                rm -f  $${subdir}/*~ ; \
                rm -f  $${subdir}/*.orig ; \
-               rm -f  $${subdir}/[mM]akefile* ; \
+               [ "$${dir}" != "${srcdir}/etc" ] && \
+                       rm -f  $${subdir}/[mM]akefile* ; \
                rm -f  $${subdir}/ChangeLog* ; \
                rm -f  $${subdir}/dired.todo ; \
              done) ; \
@@ -708,51 +712,6 @@ extraclean:
        -rm -f config-tmp-*
        -rm -f *~ \#*
 
-### Unlocking and relocking.  The idea of these productions is to reduce
-### hassles when installing an incremental tar of Emacs.  Do `make unlock'
-### before unlocking the file to take the write locks off all sources so
-### that tar xvof will overwrite them without fuss.  Then do `make relock'
-### afterward so that VC mode will know which files should be checked in
-### if you want to mung them.
-###
-### Note: it's no disaster if these productions miss a file or two; tar
-### and VC will swiftly let you know if this happens, and it is easily
-### corrected.
-SOURCES = ChangeLog FTP INSTALL Makefile.in \
-       README configure make-dist move-if-change
-
-.PHONY: unlock relock
-
-unlock:
-       chmod u+w $(SOURCES)
-       -(cd elisp; chmod u+w Makefile README *.texi)
-       (cd etc; $(MAKE) $(MFLAGS) unlock)
-       (cd lib-src; $(MAKE) $(MFLAGS) unlock)
-       (cd lisp; $(MAKE) $(MFLAGS) unlock)
-       (cd lisp/term; chmod u+w README *.el)
-       (cd doc/emacs; chmod u+w *.texi ChangeLog)
-       (cd doc/misc; chmod u+w *.texi ChangeLog)
-       (cd doc/lispref; chmod u+w *texi* ChangeLog)
-       (cd doc/lispintro; chmod u+w *texi* ChangeLog)
-       (cd oldXMenu; chmod u+w *.[ch] Makefile README)
-       (cd lwlib; chmod u+w *.[ch] Makefile README)
-       (cd src; $(MAKE) $(MFLAGS) unlock)
-
-relock:
-       chmod u-w $(SOURCES)
-       -(cd elisp; chmod u-w Makefile README *.texi)
-       (cd etc; $(MAKE) $(MFLAGS) relock)
-       (cd lib-src; $(MAKE) $(MFLAGS) relock)
-       (cd lisp; $(MAKE) $(MFLAGS) relock)
-       (cd lisp/term; chmod u-w README *.el)
-       (cd doc/emacs; chmod u-w *.texi ChangeLog)
-       (cd doc/misc; chmod u-w *.texi ChangeLog)
-       (cd doc/lispref; chmod u-w *texi* ChangeLog)
-       (cd doc/lispintro; chmod u-w *texi* ChangeLog)
-       (cd oldXMenu; chmod u-w *.[ch] Makefile README)
-       (cd lwlib; chmod u-w *.[ch] Makefile README)
-       (cd src; $(MAKE) $(MFLAGS) relock)
-
 # The src subdir knows how to do the right thing
 # even when the build directory and source dir are different.
 TAGS tags: lib-src src