(Farray_length): Delete this obsolete function.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3812aa0..2490472 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,7 +82,7 @@ datadir=@datadir@
 # runs.         These files are all architecture-independent. Right now, the
 # only such data is the locking directory; ${lockdir} is a
 # subdirectory of this.
-sharedstatedir=@statedir@
+sharedstatedir=@sharedstatedir@
 
 # Where to install and expect executable files to be run by Emacs
 # rather than directly by users, and other architecture-dependent
@@ -99,6 +99,9 @@ manext=.1
 # system, it is inappropriate to imply that it is part of Emacs.
 infodir=@infodir@
 
+# Where to look for bitmap files.
+bitmapdir=@bitmapdir@
+
 # Where to find the source code.  The source code for Emacs's C kernel is
 # expected to be in ${srcdir}/src, and the source code for Emacs's
 # utility programs is expected to be in ${srcdir}/lib-src.  This is
@@ -208,6 +211,7 @@ src/paths.h: Makefile ${srcdir}/src/paths.h.in
          -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'               \
          -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";'                  \
          -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";'                   \
+         -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";'             \
          -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";'                    \
          -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') &&             \
        ${srcdir}/move-if-change paths.h.tmp$$$$ src/paths.h
@@ -232,6 +236,7 @@ paths-force: FRC src/paths.h
          -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'               \
          -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";'                  \
          -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";'                   \
+         -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";'             \
          -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";'                    \
          -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') &&             \
        ${srcdir}/move-if-change paths.h.tmp$$$$ src/paths.h
@@ -307,6 +312,7 @@ install-arch-dep: mkdir
 # 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 \
@@ -327,8 +333,11 @@ install-arch-indep: mkdir
                 rm -rf $${subdir}/CVS ; \
                 rm -f  $${subdir}/\#* ; \
                 rm -f  $${subdir}/*~ ; \
+                rm -f  $${subdir}/*.orig ; \
               done) ; \
         done
+       -rm -f ${lispdir}/subdirs.el
+       ./update-subdirs ${lispdir}
        if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
        then \
           echo "Copying etc/DOC-* ..." ; \
@@ -382,9 +391,9 @@ uninstall:
            esac ;                                      \
          fi ;                                          \
        done
-       (cd ${infodir}; rm -f cl* emacs* forms* info* vip*)
-       (cd ${mandir};  rm -f emacs.1 etags.1 ctags.1)
-       (cd ${bindir};  rm -f emacs-${version} $(EMACS))
+       (cd ${infodir} && rm -f cl* emacs* forms* info* vip*)
+       (cd ${mandir}  && rm -f emacs.1 etags.1 ctags.1)
+       (cd ${bindir}  && rm -f emacs-${version} $(EMACS))
 
 
 FRC:
@@ -427,9 +436,9 @@ clean: FRC
 ###      `make distclean' should leave only the files that were in the
 ###      distribution.
 top_distclean=\
-       rm -f config.status build-install ; \
+       rm -f config.status ; \
        rm -f Makefile ${SUBDIR_MAKEFILES} ; \
-       (cd lock ; rm -f *)
+       (cd lock && rm -f *)
 distclean: FRC
        (cd src;      $(MAKE) $(MFLAGS) distclean)
        (cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
@@ -464,7 +473,7 @@ realclean: FRC
 ### it deletes backup and autosave files too.
 extraclean:
        for i in ${SUBDIR}; do (cd $$i; $(MAKE) $(MFLAGS) extraclean); done
-       -(cd lock; rm *)
+       -(cd lock && rm *)
        -rm config.status config-tmp-*
        -rm -f *~ \#*
 
@@ -479,7 +488,7 @@ extraclean:
 ### and VC will swiftly let you know if this happens, and it is easily
 ### corrected.
 SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in PROBLEMS \
-       README build-install.in configure make-dist move-if-change
+       README configure make-dist move-if-change
 
 .PHONY: unlock relock
 
@@ -514,6 +523,7 @@ check:
        @echo "We don't have any tests for GNU Emacs yet."
 
 dist:
+       ./update-subdirs ${srcdir}/lisp
        cd ${srcdir}; make-dist
 
 .PHONY: info dvi dist check