Add -znocombreloc to LDFLAGS if supported.

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 264b99f6d3331089f25000e68240ded94414fccb..d7ed0676b0c2ff9756be7f36d20e6499d080efbc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,8 +2,8 @@
 # DIST: make most of the changes to this file you might want, so try
 # DIST: that first.
 
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#  2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992,93,94,95,96,97,98,1999,2000,01,02,03,2004
+#   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -53,6 +53,10 @@
 
 SHELL = /bin/sh
 
+# This may not work with certain non-GNU make's.  It only matters when
+# inheriting a CDPATH not starting with the current directory.
+CDPATH=
+
 # If Make doesn't predefine MAKE, set it here.
 @SET_MAKE@
 
@@ -630,6 +634,7 @@ maintainer-clean: FRC
        -(cd lispref &&   $(MAKE) $(MFLAGS) maintainer-clean)
        -(cd lispintro &&   $(MAKE) $(MFLAGS) maintainer-clean)
        (cd leim;     $(MAKE) $(MFLAGS) maintainer-clean)
+       (cd lisp;     $(MAKE) $(MFLAGS) maintainer-clean)
        ${top_distclean}
 
 ### This doesn't actually appear in the coding standards, but Karl
@@ -730,7 +735,7 @@ maybe_bootstrap:
        fi
 
 bootstrap: bootstrap-clean-before info FRC
-       (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
+       (cd lisp; $(MAKE) $(MFLAGS) bootstrap-prepare)
        (cd src; $(MAKE) $(MFLAGS) bootstrap)
        (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs${EXEEXT})
        (cd src; $(MAKE) $(MFLAGS) mostlyclean)