Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 36c6628950c07d6d9eb22bc077f4525e2f4eca14..9953dd4db9312a79c9442ae304888478a74bf047 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -206,12 +206,12 @@ all: ${SUBDIR}
 
 removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
 
-# Generate paths.h from paths.in.  This target is invoked by `configure'.
-paths-force: FRC
+# Generate epaths.h from epaths.in.  This target is invoked by `configure'.
+epaths-force: FRC
        @(lisppath=`echo ${lisppath} | ${removenullpaths}` ;            \
          buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ;  \
          x_default_search_path=`echo ${x_default_search_path}`; \
-         sed < ${srcdir}/src/paths.in > paths.h.$$$$           \
+         sed < ${srcdir}/src/epaths.in > epaths.h.$$$$         \
          -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";'        \
          -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \
          -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'               \
@@ -220,7 +220,7 @@ paths-force: FRC
          -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";'             \
          -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \
          -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') &&                \
-       ${srcdir}/move-if-change paths.h.$$$$ src/paths.h
+       ${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h
 
 # For parallel make, src should be build before leim.
 leim:   src
@@ -400,7 +400,7 @@ install-arch-indep: mkdir
             ${INSTALL_INFO} --dir-file=${infodir}/dir --info-file=${infodir}/$$f); \
          done; \
        else true; fi
-       -chmod -R a+r ${COPYDESTS} ${infodir}
+       -chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir}
        thisdir=`/bin/pwd`; \
        cd ${srcdir}/etc; \
        for page in emacs etags ctags ; do \
@@ -425,8 +425,12 @@ install-strip:
 ### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
 ### instead of mkdir.  Not all systems' mkdir programs have the `-p' flag.
 mkdir: FRC
+       if [ -d ${datadir} ]; then true; else \
+         $(srcdir)/mkinstalldirs ${datadir}; \
+         chmod a+r ${datadir};\
+       fi
        $(srcdir)/mkinstalldirs ${COPYDESTS} ${infodir} ${man1dir} \
-         ${bindir} ${datadir} ${docdir} ${libexecdir} \
+         ${bindir} ${docdir} ${libexecdir} \
          ${datadir}/emacs/site-lisp \
          ${datadir}/emacs/${version}/site-lisp \
          `echo ${locallisppath} | sed 's/:/ /g'`