(cpp-parse-open): Delete comments that go past end of line.

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 24904725b1a203561b62eb2b76174fb80fffa372..e2d90b8980bbcf0d10b96719d36685c163d5cdee 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,7 +22,7 @@
 #      `make distclean' should leave only the files that were in the
 #      distribution.
 # 
-# make realclean
+# make maintainer-clean
 #      Delete everything from the current directory that can be
 #      reconstructed with this Makefile.  This typically includes
 #      everything deleted by distclean, plus more: C source files
@@ -257,7 +257,8 @@ ${SUBDIR}: ${SUBDIR_MAKEFILES} FRC
          LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
 
 blessmail: ${SUBDIR_MAKEFILES} src FRC
-       cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) MAKE='${MAKE}'
+       cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) \
+         MAKE='${MAKE}' archlibdir='$(archlibdir)'
 
 Makefile: Makefile.in config.status
        ./config.status
@@ -309,10 +310,6 @@ install-arch-dep: mkdir
 ### Note that we copy the DOC-* files from the build etc directory
 ### as well as lots of things from ${srcdir}/etc.
 
-# These lines appeared after the second -set, but should be unnecessary.
-#       mkdir ${COPYDESTS} ; \
-#       chmod ugo+rx ${COPYDESTS} ; \
-# The backslash above continues the comment onto this line.  It ends here.
 install-arch-indep: mkdir
        -set ${COPYDESTS} ; \
         for dir in ${COPYDIR} ; do \
@@ -322,6 +319,8 @@ install-arch-indep: mkdir
           shift ; \
         done
        -set ${COPYDESTS} ; \
+        mkdir ${COPYDESTS} ; \
+        chmod ugo+rx ${COPYDESTS} ; \
         for dir in ${COPYDIR} ; do \
           dest=$$1 ; shift ; \
           [ -d $${dir} ] \
@@ -332,12 +331,13 @@ install-arch-indep: mkdir
                 rm -rf $${subdir}/RCS ; \
                 rm -rf $${subdir}/CVS ; \
                 rm -f  $${subdir}/\#* ; \
+                rm -f  $${subdir}/.\#* ; \
                 rm -f  $${subdir}/*~ ; \
                 rm -f  $${subdir}/*.orig ; \
               done) ; \
         done
        -rm -f ${lispdir}/subdirs.el
-       ./update-subdirs ${lispdir}
+       $(srcdir)/update-subdirs ${lispdir}
        if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
        then \
           echo "Copying etc/DOC-* ..." ; \
@@ -361,7 +361,7 @@ install-arch-indep: mkdir
 ### Build all the directories we're going to install Emacs in. Since
 ### we may be creating several layers of directories (for example,
 ### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
-### instead of mkdir.  Not all systems' mkdirs have the `-p' flag.
+### instead of mkdir.  Not all systems' mkdir programs have the `-p' flag.
 mkdir: FRC
        $(srcdir)/mkinstalldirs ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \
          ${bindir} ${datadir} ${docdir} ${libexecdir} \
@@ -400,7 +400,7 @@ FRC:
 
 # ==================== Cleaning up and miscellanea ====================
 
-.PHONY: mostlyclean clean distclean realclean extraclean
+.PHONY: mostlyclean clean distclean maintainer-clean extraclean
 
 ### `mostlyclean'
 ###      Like `clean', but may refrain from deleting a few files that people
@@ -436,7 +436,7 @@ clean: FRC
 ###      `make distclean' should leave only the files that were in the
 ###      distribution.
 top_distclean=\
-       rm -f config.status ; \
+       rm -f config.status config.cache ; \
        rm -f Makefile ${SUBDIR_MAKEFILES} ; \
        (cd lock && rm -f *)
 distclean: FRC
@@ -448,23 +448,23 @@ distclean: FRC
        ${top_distclean}
        
 
-### `realclean'
+### `maintainer-clean'
 ###      Delete everything from the current directory that can be
 ###      reconstructed with this Makefile.  This typically includes
 ###      everything deleted by distclean, plus more: C source files
 ###      produced by Bison, tags tables, info files, and so on.
 ### 
-###      One exception, however: `make realclean' should not delete
+###      One exception, however: `make maintainer-clean' should not delete
 ###      `configure' even if `configure' can be remade using a rule in the
-###      Makefile.  More generally, `make realclean' should not delete
+###      Makefile.  More generally, `make maintainer-clean' should not delete
 ###      anything that needs to exist in order to run `configure' and then
 ###      begin to build the program.
-realclean: FRC
-       (cd src;      $(MAKE) $(MFLAGS) realclean)
-       (cd oldXMenu; $(MAKE) $(MFLAGS) realclean)
-       (cd lwlib;    $(MAKE) $(MFLAGS) realclean)
-       (cd lib-src;  $(MAKE) $(MFLAGS) realclean)
-       -(cd man &&   $(MAKE) $(MFLAGS) realclean)
+maintainer-clean: FRC
+       (cd src;      $(MAKE) $(MFLAGS) maintainer-clean)
+       (cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean)
+       (cd lwlib;    $(MAKE) $(MFLAGS) maintainer-clean)
+       (cd lib-src;  $(MAKE) $(MFLAGS) maintainer-clean)
+       -(cd man &&   $(MAKE) $(MFLAGS) maintainer-clean)
        ${top_distclean}
 
 ### This doesn't actually appear in the coding standards, but Karl
@@ -523,7 +523,7 @@ check:
        @echo "We don't have any tests for GNU Emacs yet."
 
 dist:
-       ./update-subdirs ${srcdir}/lisp
+       $(srcdir)/update-subdirs ${srcdir}/lisp
        cd ${srcdir}; make-dist
 
 .PHONY: info dvi dist check
@@ -531,4 +531,4 @@ force-info:
 info: force-info
        (cd ${srcdir}/man; $(MAKE) $(MFLAGS) info)
 dvi:
-       (cd ${srcdir}/man; $(MAKE) $(MFLAGS) dvi)
+       (cd man; $(MAKE) $(MFLAGS) dvi)