* m/delta.h (HAVE_SOCKETS): defined if HAVE_INET_SOCKETS is defined.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 9712da1..5f0de13 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,9 @@
 #      Still more severe - delete backup and autosave files, too.
 
 SHELL = /bin/sh
-MAKE = make  # BSD doesn't have it as a default.
+
+# If Make doesn't predefine MAKE, set it here.
+@SET_MAKE@
 
 # ==================== Things `configure' Might Edit ====================
 
@@ -174,9 +176,6 @@ INSTALL_DATA = @INSTALL_DATA@
 
 # ============================= Targets ==============================
 
-# This directory's absolute name.
-thisdir = `pwd`
-
 # Subdirectories to make recursively.  `lisp' is not included
 # because the compiled lisp files are part of the distribution
 # and you cannot remake them without installing Emacs first.
@@ -304,18 +303,19 @@ install-arch-indep: mkdir
           echo "Copying etc/DOC* ..." ; \
           (cd etc; tar -cf - DOC*)|(cd ${docdir}; umask 0; tar -xvf - ); \
        else true; fi
+       thisdir=`pwd`; \
        if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
-       then
+       then \
          (cd ${srcdir}/info ; \
           if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \
-            (cd this_dir; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
+            (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
           fi ; \
-          for f in cl* emacs* dired-x* forms* gnus* info* sc* vip* ; do \
-            (cd this_dir; ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \
+          for f in cl* emacs* forms* gnus* info* sc* vip* ; do \
+            (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f); \
           done); \
        else true; fi
-       cd ${srcdir}/etc; for page in emacs etags ctags ; do \
-         (cd this_dir; ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext}); \
+       thisdir=`pwd`; cd ${srcdir}/etc; for page in emacs etags ctags ; do \
+         (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext}); \
        done
 
 ### Build all the directories we're going to install Emacs in. Since