(ph-server): Fix customize type.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index d3e79ee..5ae191d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,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
@@ -114,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
@@ -156,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
@@ -210,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}'";' \
@@ -217,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
@@ -249,6 +247,9 @@ src/config.stamp: src/config.in config.status
 lib-src/Makefile: lib-src/Makefile.in config.status
        ./config.status
 
+man/Makefile: man/Makefile.in config.status
+       ./config.status
+
 oldXMenu/Makefile: oldXMenu/Makefile.in config.status
        ./config.status
 
@@ -316,7 +317,8 @@ install-arch-indep: mkdir
          [ -d $${dir} ] \
          && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \
          && (echo "Copying $${dir} to $${dest}..." ; \
-             (cd $${dir}; tar -cf - . )|(cd $${dest};umask 022; tar -xvf - ); \
+             (cd $${dir}; tar -cf - . ) \
+               |(cd $${dest};umask 022; tar -xvf - && cat > /dev/null); \
              for subdir in `find $${dest} -type d ! -name RCS -print` ; do \
                rm -rf $${subdir}/RCS ; \
                rm -rf $${subdir}/CVS ; \
@@ -335,15 +337,18 @@ install-arch-indep: mkdir
        if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
        then \
           echo "Copying etc/DOC-* to ${docdir} ..." ; \
-          (cd ./etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
+          (cd ./etc; tar -cf - DOC*) \
+            |(cd ${docdir}; umask 0; tar -xvf - && cat > /dev/null); \
           (cd $(docdir); chmod a+r DOC*; rm DOC) \
        else true; fi
        if [ -r ./lisp ] \
+          && [ -r ./lisp/simple.el ] \
           && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
           && [ x`(cd ${srcdir}/lisp; /bin/pwd)` != x`(cd ./lisp; /bin/pwd)` ]; \
        then \
           echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \
-          (cd lisp; tar -cf - *.el *.elc)|(cd ${lispdir}; umask 0; tar -xvf - ); \
+          (cd lisp; tar -cf - *.el *.elc) \
+            |(cd ${lispdir}; umask 0; tar -xvf - && cat > /dev/null); \
        else true; fi
        thisdir=`/bin/pwd`; \
        if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
@@ -386,10 +391,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
@@ -542,8 +546,10 @@ relock:
        (cd lwlib; chmod u+w *.[ch] Makefile README)
        (cd src; $(MAKE) $(MFLAGS) relock)
 
-TAGS tags:     lib-src
-       cd ${srcdir}/src; $(MAKE) tags
+TAGS tags:     lib-src src
+       # The src subdir knows how to do the right thing
+       # even when the build directory and source dir are different.
+       cd src; $(MAKE) tags
 
 check:
        @echo "We don't have any tests for GNU Emacs yet."