From: Bernhard Reutner-Fischer Date: Thu, 2 Mar 2006 17:33:25 +0000 (-0000) Subject: - use absolute path for top_builddir and top_srcdir. X-Git-Tag: android-x86-2.2~5189 X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=022eb311d57ba252423c3dc4398cda1d41ae986c;p=android-x86%2Fexternal-busybox.git - 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 03491d25b..155279942 100644 --- 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 d5d950e56..2cb5ebc95 100644 --- 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 e985fa49f..3f0ebcec1 100644 --- 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 5250e7638..202b5347d 100644 --- 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 d3f745a0f..f7fdc4bab 100644 --- 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 0a1c80a41..e8bc65d3d 100644 --- 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 41da6c4d9..614bfbe92 100644 --- 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 e6299e6dd..a42290ee0 100644 --- 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 7c2e4ef7d..941c4c76d 100644 --- 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 ffafd38b3..b02d69c99 100644 --- 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 d31aad1b8..828971ab1 100644 --- 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 6e6a398b4..1d4f547c7 100644 --- 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 2af51d762..270cf53dd 100644 --- 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 ebaa82865..bbf28130e 100644 --- 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 8640decbc..64cd56e30 100644 --- 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 2e0585fdb..fa7a2a31e 100644 --- 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 d0427d4d9..98bd7f880 100644 --- 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 d3aefaaf4..96b1449e3 100644 --- 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 3d32db50a..7c027edc0 100644 --- 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 3be62477e..179371a18 100644 --- 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 8983ee5f3..716e130da 100644 --- a/scripts/config/Makefile +++ b/scripts/config/Makefile @@ -2,8 +2,12 @@ # # Copyright (C) 2002 Erik Andersen +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 5c56a2789..c29ec3464 100644 --- 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 788958a66..e6594f025 100644 --- 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 33e5ffe86..de51b7594 100644 --- 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