Version 3.15

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3fb0f78421c514177c3ff95b19b1a53ac44d9dce..c8fa29b3439febb176f4985603e65a3eeda02ab6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
 # DIST: make most of the changes to this file you might want, so try
 # DIST: that first.
 
-# Copyright (C) 1992,93,94,95,96,97,98,1999,2000,01,02,03,2004
+# Copyright (C) 1992,93,94,95,96,97,98,1999,2000,01,02,03,04,2005
 #   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -19,8 +19,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # make all     to compile and build Emacs.
 # make install to install it.
@@ -260,8 +260,8 @@ epaths-force: FRC
          x_default_search_path=`echo ${x_default_search_path}`; \
          gamedir=`echo ${gamedir}`; \
          sed < ${srcdir}/src/epaths.in > epaths.h.$$$$         \
-         -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";'        \
-         -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \
+         -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'"$${lisppath}"'";'      \
+         -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'"$${buildlisppath}"'";' \
          -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'               \
          -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";'                  \
          -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";'                   \
@@ -302,12 +302,14 @@ Makefile: $(srcdir)/Makefile.in config.status
 config.status: ${srcdir}/configure
        ./config.status --recheck
 
-${srcdir}/configure: @MAINT@ ${srcdir}/configure.in
+AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/m4/getopt.m4
+
+$(srcdir)/configure: $(AUTOCONF_INPUTS)
        cd ${srcdir} && autoconf
 
 $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
        @true
-$(srcdir)/src/stamp-h.in: @MAINT@ ${srcdir}/configure.in
+$(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
        cd ${srcdir} && autoheader
        rm -f $(srcdir)/src/stamp-h.in
        echo timestamp > $(srcdir)/src/stamp-h.in
@@ -719,9 +721,9 @@ force-info:
 # put the info files in $(srcdir),
 # so we can do ok running make in the build dir.
 info: force-info
-       -(cd man; $(MAKE) $(MFLAGS) info)
-       -(cd lispref; $(MAKE) $(MFLAGS) info)
-       -(cd lispintro; $(MAKE) $(MFLAGS) info)
+       (cd man; $(MAKE) $(MFLAGS) info)
+       (cd lispref; $(MAKE) $(MFLAGS) info)
+       (cd lispintro; $(MAKE) $(MFLAGS) info)
 dvi:
        (cd man; $(MAKE) $(MFLAGS) dvi)
        (cd lispref; $(MAKE) $(MFLAGS) elisp.dvi)