- use absolute path for top_builddir and top_srcdir.

  Fixes make trying to include the very same file in an endless loop.

diff --git a/applets/Makefile b/applets/Makefile
index 03491d25b6c74c712f791feec6971e1bfff871b1..155279942a612b5d66dbf9259e64f533ae058b64 100644 (file)
--- 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

diff --git a/archival/Makefile b/archival/Makefile
index d5d950e56b0b0a43e40d11c670d484c1d2acb1c7..2cb5ebc9554e7bff2ce79f0a5f77dac1fed179d3 100644 (file)
--- 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

diff --git a/archival/libunarchive/Makefile b/archival/libunarchive/Makefile
index e985fa49f73c4a05c6faf74c82fc84953873c7c0..3f0ebcec1ce4169ea21ff13e8a209f4241c66c3d 100644 (file)
--- 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

diff --git a/console-tools/Makefile b/console-tools/Makefile
index 5250e763846eaf273cb787f6fa4cdb0054263095..202b5347d682988ce8bb56b7c807e7b84435bf29 100644 (file)
--- 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

diff --git a/coreutils/Makefile b/coreutils/Makefile
index d3f745a0fff58511414bf6cb313840f7b68d7135..f7fdc4bab4d85f3a615c7236dd9608cd56244054 100644 (file)
--- 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

diff --git a/coreutils/libcoreutils/Makefile b/coreutils/libcoreutils/Makefile
index 0a1c80a4135fc0372b0474caf6996050f5aa4ebe..e8bc65d3de157c87ff777bc0276f80b372efef58 100644 (file)
--- 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

diff --git a/debianutils/Makefile b/debianutils/Makefile
index 41da6c4d9bedbd2d9907e1e0e37cf6242a5f7708..614bfbe923e22a1d90522fddbd0c732a37410ed7 100644 (file)
--- 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

diff --git a/e2fsprogs/Makefile b/e2fsprogs/Makefile
index e6299e6dd62f045dabbca01965a4e357fc8fafae..a42290ee05a67102817ff5cc6a584479c1d43a39 100644 (file)
--- 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

diff --git a/editors/Makefile b/editors/Makefile
index 7c2e4ef7d2a59a7698e72d197a87a7691fba78d1..941c4c76d0b143ef24df13331c3d3a21e3b43cf9 100644 (file)
--- 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

diff --git a/findutils/Makefile b/findutils/Makefile
index ffafd38b304f751c5f55f5a6ec3f119b19a5c532..b02d69c99660ebff15a9b4b8e9718f0cf4c47610 100644 (file)
--- 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

diff --git a/init/Makefile b/init/Makefile
index d31aad1b8cc42be35deac1caef85dfc03a8bd219..828971ab178eccf39370a1a6d9ab7017fc83420e 100644 (file)
--- 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

diff --git a/libbb/Makefile b/libbb/Makefile
index 6e6a398b45aa68b3128dce0b0f8de78090bcb4ce..1d4f547c7e55da1803f0d384813edc99982ca1a8 100644 (file)
--- 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

diff --git a/libpwdgrp/Makefile b/libpwdgrp/Makefile
index 2af51d762ad9068c5272d5674319629f8a492233..270cf53dd31fc4958fe4419c1b14e7ad61d8520b 100644 (file)
--- 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

diff --git a/loginutils/Makefile b/loginutils/Makefile
index ebaa82865918e6c2e60830a332217a8bf9ff0724..bbf28130eb1e563eb2966519a8e80dcc338f28d8 100644 (file)
--- 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

diff --git a/miscutils/Makefile b/miscutils/Makefile
index 8640decbcc7a9583028dc19829c663a524db9f92..64cd56e30406ff8a8e37aee5415f4dfbc2ff6cdc 100644 (file)
--- 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

diff --git a/modutils/Makefile b/modutils/Makefile
index 2e0585fdb8184880de07bde7851d55ab5cebae1f..fa7a2a31e185ac2f1dafbad95edcc6326636672e 100644 (file)
--- 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

diff --git a/networking/Makefile b/networking/Makefile
index d0427d4d951773370c95051b6f8578da4e32632e..98bd7f88056b8e96cc2a0f61547e046d0b782899 100644 (file)
--- 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

diff --git a/networking/libiproute/Makefile b/networking/libiproute/Makefile
index d3aefaaf4fc71625be4a4ce45c4216c4af159fc9..96b1449e3d489d5595c786f394cbe023f7f318e8 100644 (file)
--- 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

diff --git a/networking/udhcp/Makefile b/networking/udhcp/Makefile
index 3d32db50a680c641b9cd29d389d4e9a85633e6c2..7c027edc04743320612769f3c607b5f46b2d0588 100644 (file)
--- 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

diff --git a/procps/Makefile b/procps/Makefile
index 3be62477e8951bb24cff48aeca9877eedd4e223f..179371a18599c60e586841568b2f99ce35195a76 100644 (file)
--- 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

diff --git a/scripts/config/Makefile b/scripts/config/Makefile
index 8983ee5f3f53f376799ae71cf785ac647d6c110b..716e130da53716b42761e34f787fbbd6e8d866d4 100644 (file)
--- 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
 

diff --git a/shell/Makefile b/shell/Makefile
index 5c56a2789d126683e66afdbc6ad5a821bcf0fe1c..c29ec3464c3ce1af798e3a1a4282b3a338c8db53 100644 (file)
--- 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

diff --git a/sysklogd/Makefile b/sysklogd/Makefile
index 788958a664e8a8c79b782ebf32543fe3bb4fd46c..e6594f0255e0a53b69ae613b0ab2c6562c7306ea 100644 (file)
--- 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

diff --git a/util-linux/Makefile b/util-linux/Makefile
index 33e5ffe868cd1cd784e652b5f5a20cadc5d7344f..de51b7594e3e962e0dfc64f191fb2e78fd0c9be0 100644 (file)
--- 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