(last): New function.

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 192375b367e481497472af641ea12027a869800b..15c197cc342693fc1d46eacfbcb12ec89c99f70f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,6 +45,7 @@ ALLOCA=@ALLOCA@
 LN_S=@LN_S@
 CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@
+CPPFLAGS=@CPPFLAGS@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
 LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@
 YACC=@YACC@
@@ -80,9 +81,8 @@ bindir=@bindir@
 datadir=@datadir@
 
 # Where to install and expect the files that Emacs modifies as it
-# runs.         These files are all architecture-independent. Right now, the
-# only such data is the locking directory; ${lockdir} is a
-# subdirectory of this.
+# runs.  These files are all architecture-independent.
+# Right now, this is not used.
 sharedstatedir=@sharedstatedir@
 
 # Where to install and expect executable files to be run by Emacs
@@ -113,6 +113,9 @@ srcdir=@srcdir@
 # Tell make where to find source files; this is needed for the makefiles.
 VPATH=@srcdir@
 
+# Where to find the application default.
+x_default_search_path=@x_default_search_path@
+
 # ==================== Emacs-specific directories ====================
 
 # These variables hold the values Emacs will actually use.  They are
@@ -155,11 +158,6 @@ buildlisppath=${srcdir}/lisp
 # at once.
 etcdir=@etcdir@
 
-# Where to create and expect the locking directory, where
-# the Emacs locking code keeps track of which files are
-# currently being edited.
-lockdir=@lockdir@
-
 # Where to put executables to be run by Emacs rather than
 # the user.  This path usually includes the Emacs version
 # and configuration name, so that multiple configurations
@@ -209,6 +207,7 @@ removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
 paths-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.$$$$           \
          -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";'        \
          -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \
@@ -216,8 +215,8 @@ paths-force: FRC
          -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}/";') &&             \
+         -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
 
 src:   lib-src FRC
@@ -385,10 +384,9 @@ 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
-       $(srcdir)/mkinstalldirs ${COPYDESTS} ${lockdir} ${infodir} ${man1dir} \
+       $(srcdir)/mkinstalldirs ${COPYDESTS} ${infodir} ${man1dir} \
          ${bindir} ${datadir} ${docdir} ${libexecdir} \
          `echo ${locallisppath} | sed 's/:/ /g'`
-       -chmod a+rwx ${lockdir}
 
 ### Delete all the installed files that the `install' target would
 ### create (but not the noninstalled files such as `make all' would