- use absolute path for top_builddir and top_srcdir.

Fixes make trying to include the very same file in an endless loop.
2006-03-02 17:33:25 +00:00
parent c0bb308389
commit 022eb311d5
24 changed files with 96 additions and 0 deletions
--- a/applets/Makefile
+++ b/applets/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/applets
 APPLETS_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/archival/Makefile
+++ b/archival/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 ARCHIVAL_DIR:=./
 srcdir=$(top_srcdir)/archival
 include $(top_builddir)/Rules.mak
--- a/archival/libunarchive/Makefile
+++ b/archival/libunarchive/Makefile
@@ -17,8 +17,12 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #

+ifndef top_srcdir
 top_srcdir=../..
+endif
+ifndef top_builddir
 top_builddir=../..
+endif
 srcdir=$(top_srcdir)/archival/libunarchive
 LIBUNARCHIVE_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/console-tools/Makefile
+++ b/console-tools/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/console/tools
 CONSOLETOOLS_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/coreutils/Makefile
+++ b/coreutils/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/coreutils
 SHELLUTILS_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/coreutils/libcoreutils/Makefile
+++ b/coreutils/libcoreutils/Makefile
@@ -17,8 +17,12 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #

+ifndef top_srcdir
 top_srcdir=../..
+endif
+ifndef top_builddir
 top_builddir=../..
+endif
 srcdir=$(top_srcdir)/coreutils/libcoreutils
 LIBCOREUTILS_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/debianutils/Makefile
+++ b/debianutils/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/debianutils
 DEBIANUTILS_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/e2fsprogs/Makefile
+++ b/e2fsprogs/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/e2fsprogs
 E2FSPROGS_DIR:=./
 include $(top_builddir)/.config
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/editors
 EDITOR_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/findutils/Makefile
+++ b/findutils/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/findutils
 FINDUTILS_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/init/Makefile
+++ b/init/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/init
 INIT_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/libbb/Makefile
+++ b/libbb/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/libbb
 LIBBB_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/libpwdgrp/Makefile
+++ b/libpwdgrp/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/libpwgrp
 LIBPWDGRP_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/loginutils/Makefile
+++ b/loginutils/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/loginutils
 LOGINUTILS_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/miscutils/Makefile
+++ b/miscutils/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/miscutils
 MISCUTILS_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/modutils/Makefile
+++ b/modutils/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/modutils
 MODUTILS_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/networking/Makefile
+++ b/networking/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/networking
 NETWORKING_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/networking/libiproute/Makefile
+++ b/networking/libiproute/Makefile
@@ -17,8 +17,12 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #

+ifndef top_srcdir
 top_srcdir=../..
+endif
+ifndef top_builddir
 top_builddir=../..
+endif
 srcdir=$(top_srcdir)/networking/libiproute
 LIBIPROUTE_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/networking/udhcp/Makefile
+++ b/networking/udhcp/Makefile
@@ -17,8 +17,12 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #

+ifndef top_srcdir
 top_srcdir=../..
+endif
+ifndef top_builddir
 top_builddir=../..
+endif
 srcdir=$(top_srcdir)/networking/udhcp
 UDHCP_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/procps/Makefile
+++ b/procps/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/procps
 PROCPS_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/scripts/config/Makefile
+++ b/scripts/config/Makefile
@@ -2,8 +2,12 @@
 #
 # Copyright (C) 2002 Erik Andersen <andersen@codepoet.org>

+ifndef top_srcdir
 top_srcdir=../..
+endif
+ifndef top_builddir
 top_builddir=../..
+endif
 srcdir=$(top_srcdir)/scripts/config
 include $(top_srcdir)/Rules.mak

--- a/shell/Makefile
+++ b/shell/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/shell
 SHELL_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/sysklogd/Makefile
+++ b/sysklogd/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/sysklogd
 SYSKLOGD_DIR:=./
 include $(top_builddir)/Rules.mak
--- a/util-linux/Makefile
+++ b/util-linux/Makefile
@@ -4,8 +4,12 @@
 #
 # Licensed under the GPL v2, see the file LICENSE in this tarball.

+ifndef top_srcdir
 top_srcdir=..
+endif
+ifndef top_builddir
 top_builddir=..
+endif
 srcdir=$(top_srcdir)/util-linux
 UTILLINUX_DIR:=./
 include $(top_builddir)/Rules.mak