aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-03-02 17:33:25 +0000
committeraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-03-02 17:33:25 +0000
commitcdca803fddf45cd3e8cced831edb8109eb9ef7a2 (patch)
tree7be09f0f57ca820b27b6b397d8e2c0f8f33212c4
parent7e725ab33fcc7329968b30a24f030d22a34e1b62 (diff)
downloadbusybox-w32-cdca803fddf45cd3e8cced831edb8109eb9ef7a2.tar.gz
busybox-w32-cdca803fddf45cd3e8cced831edb8109eb9ef7a2.tar.bz2
busybox-w32-cdca803fddf45cd3e8cced831edb8109eb9ef7a2.zip
- use absolute path for top_builddir and top_srcdir.
Fixes make trying to include the very same file in an endless loop. git-svn-id: svn://busybox.net/trunk/busybox@14429 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--applets/Makefile4
-rw-r--r--archival/Makefile4
-rw-r--r--archival/libunarchive/Makefile4
-rw-r--r--console-tools/Makefile4
-rw-r--r--coreutils/Makefile4
-rw-r--r--coreutils/libcoreutils/Makefile4
-rw-r--r--debianutils/Makefile4
-rw-r--r--e2fsprogs/Makefile4
-rw-r--r--editors/Makefile4
-rw-r--r--findutils/Makefile4
-rw-r--r--init/Makefile4
-rw-r--r--libbb/Makefile4
-rw-r--r--libpwdgrp/Makefile4
-rw-r--r--loginutils/Makefile4
-rw-r--r--miscutils/Makefile4
-rw-r--r--modutils/Makefile4
-rw-r--r--networking/Makefile4
-rw-r--r--networking/libiproute/Makefile4
-rw-r--r--networking/udhcp/Makefile4
-rw-r--r--procps/Makefile4
-rw-r--r--scripts/config/Makefile4
-rw-r--r--shell/Makefile4
-rw-r--r--sysklogd/Makefile4
-rw-r--r--util-linux/Makefile4
24 files changed, 96 insertions, 0 deletions
diff --git a/applets/Makefile b/applets/Makefile
index 03491d25b..155279942 100644
--- a/applets/Makefile
+++ b/applets/Makefile
@@ -4,8 +4,12 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/applets 13srcdir=$(top_srcdir)/applets
10APPLETS_DIR:=./ 14APPLETS_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9ARCHIVAL_DIR:=./ 13ARCHIVAL_DIR:=./
10srcdir=$(top_srcdir)/archival 14srcdir=$(top_srcdir)/archival
11include $(top_builddir)/Rules.mak 15include $(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 @@
17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18# 18#
19 19
20ifndef top_srcdir
20top_srcdir=../.. 21top_srcdir=../..
22endif
23ifndef top_builddir
21top_builddir=../.. 24top_builddir=../..
25endif
22srcdir=$(top_srcdir)/archival/libunarchive 26srcdir=$(top_srcdir)/archival/libunarchive
23LIBUNARCHIVE_DIR:=./ 27LIBUNARCHIVE_DIR:=./
24include $(top_builddir)/Rules.mak 28include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/console/tools 13srcdir=$(top_srcdir)/console/tools
10CONSOLETOOLS_DIR:=./ 14CONSOLETOOLS_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/coreutils 13srcdir=$(top_srcdir)/coreutils
10SHELLUTILS_DIR:=./ 14SHELLUTILS_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18# 18#
19 19
20ifndef top_srcdir
20top_srcdir=../.. 21top_srcdir=../..
22endif
23ifndef top_builddir
21top_builddir=../.. 24top_builddir=../..
25endif
22srcdir=$(top_srcdir)/coreutils/libcoreutils 26srcdir=$(top_srcdir)/coreutils/libcoreutils
23LIBCOREUTILS_DIR:=./ 27LIBCOREUTILS_DIR:=./
24include $(top_builddir)/Rules.mak 28include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/debianutils 13srcdir=$(top_srcdir)/debianutils
10DEBIANUTILS_DIR:=./ 14DEBIANUTILS_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/e2fsprogs 13srcdir=$(top_srcdir)/e2fsprogs
10E2FSPROGS_DIR:=./ 14E2FSPROGS_DIR:=./
11include $(top_builddir)/.config 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/editors 13srcdir=$(top_srcdir)/editors
10EDITOR_DIR:=./ 14EDITOR_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/findutils 13srcdir=$(top_srcdir)/findutils
10FINDUTILS_DIR:=./ 14FINDUTILS_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/init 13srcdir=$(top_srcdir)/init
10INIT_DIR:=./ 14INIT_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/libbb 13srcdir=$(top_srcdir)/libbb
10LIBBB_DIR:=./ 14LIBBB_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/libpwgrp 13srcdir=$(top_srcdir)/libpwgrp
10LIBPWDGRP_DIR:=./ 14LIBPWDGRP_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/loginutils 13srcdir=$(top_srcdir)/loginutils
10LOGINUTILS_DIR:=./ 14LOGINUTILS_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/miscutils 13srcdir=$(top_srcdir)/miscutils
10MISCUTILS_DIR:=./ 14MISCUTILS_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/modutils 13srcdir=$(top_srcdir)/modutils
10MODUTILS_DIR:=./ 14MODUTILS_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/networking 13srcdir=$(top_srcdir)/networking
10NETWORKING_DIR:=./ 14NETWORKING_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18# 18#
19 19
20ifndef top_srcdir
20top_srcdir=../.. 21top_srcdir=../..
22endif
23ifndef top_builddir
21top_builddir=../.. 24top_builddir=../..
25endif
22srcdir=$(top_srcdir)/networking/libiproute 26srcdir=$(top_srcdir)/networking/libiproute
23LIBIPROUTE_DIR:=./ 27LIBIPROUTE_DIR:=./
24include $(top_builddir)/Rules.mak 28include $(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 @@
17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18# 18#
19 19
20ifndef top_srcdir
20top_srcdir=../.. 21top_srcdir=../..
22endif
23ifndef top_builddir
21top_builddir=../.. 24top_builddir=../..
25endif
22srcdir=$(top_srcdir)/networking/udhcp 26srcdir=$(top_srcdir)/networking/udhcp
23UDHCP_DIR:=./ 27UDHCP_DIR:=./
24include $(top_builddir)/Rules.mak 28include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/procps 13srcdir=$(top_srcdir)/procps
10PROCPS_DIR:=./ 14PROCPS_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
2# 2#
3# Copyright (C) 2002 Erik Andersen <andersen@codepoet.org> 3# Copyright (C) 2002 Erik Andersen <andersen@codepoet.org>
4 4
5ifndef top_srcdir
5top_srcdir=../.. 6top_srcdir=../..
7endif
8ifndef top_builddir
6top_builddir=../.. 9top_builddir=../..
10endif
7srcdir=$(top_srcdir)/scripts/config 11srcdir=$(top_srcdir)/scripts/config
8include $(top_srcdir)/Rules.mak 12include $(top_srcdir)/Rules.mak
9 13
diff --git a/shell/Makefile b/shell/Makefile
index 5c56a2789..c29ec3464 100644
--- a/shell/Makefile
+++ b/shell/Makefile
@@ -4,8 +4,12 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/shell 13srcdir=$(top_srcdir)/shell
10SHELL_DIR:=./ 14SHELL_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/sysklogd 13srcdir=$(top_srcdir)/sysklogd
10SYSKLOGD_DIR:=./ 14SYSKLOGD_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(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 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7ifndef top_srcdir
7top_srcdir=.. 8top_srcdir=..
9endif
10ifndef top_builddir
8top_builddir=.. 11top_builddir=..
12endif
9srcdir=$(top_srcdir)/util-linux 13srcdir=$(top_srcdir)/util-linux
10UTILLINUX_DIR:=./ 14UTILLINUX_DIR:=./
11include $(top_builddir)/Rules.mak 15include $(top_builddir)/Rules.mak