svn commit: trunk/busybox: applets archival archival/libunarchive c etc...

Thu Mar 2 17:33:28 UTC 2006

Author: aldot
Date: 2006-03-02 09:33:25 -0800 (Thu, 02 Mar 2006)
New Revision: 14429

Log:
- use absolute path for top_builddir and top_srcdir.
  Fixes make trying to include the very same file in an endless loop.


Modified:
   trunk/busybox/applets/Makefile
   trunk/busybox/archival/Makefile
   trunk/busybox/archival/libunarchive/Makefile
   trunk/busybox/console-tools/Makefile
   trunk/busybox/coreutils/Makefile
   trunk/busybox/coreutils/libcoreutils/Makefile
   trunk/busybox/debianutils/Makefile
   trunk/busybox/e2fsprogs/Makefile
   trunk/busybox/editors/Makefile
   trunk/busybox/findutils/Makefile
   trunk/busybox/init/Makefile
   trunk/busybox/libbb/Makefile
   trunk/busybox/libpwdgrp/Makefile
   trunk/busybox/loginutils/Makefile
   trunk/busybox/miscutils/Makefile
   trunk/busybox/modutils/Makefile
   trunk/busybox/networking/Makefile
   trunk/busybox/networking/libiproute/Makefile
   trunk/busybox/networking/udhcp/Makefile
   trunk/busybox/procps/Makefile
   trunk/busybox/scripts/config/Makefile
   trunk/busybox/shell/Makefile
   trunk/busybox/sysklogd/Makefile
   trunk/busybox/util-linux/Makefile


Changeset:
Modified: trunk/busybox/applets/Makefile
===================================================================

--- trunk/busybox/applets/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/applets/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/archival/Makefile
===================================================================
--- trunk/busybox/archival/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/archival/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/archival/libunarchive/Makefile
===================================================================
--- trunk/busybox/archival/libunarchive/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/archival/libunarchive/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/console-tools/Makefile
===================================================================
--- trunk/busybox/console-tools/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/console-tools/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/coreutils/Makefile
===================================================================
--- trunk/busybox/coreutils/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/coreutils/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/coreutils/libcoreutils/Makefile
===================================================================
--- trunk/busybox/coreutils/libcoreutils/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/coreutils/libcoreutils/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/debianutils/Makefile
===================================================================
--- trunk/busybox/debianutils/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/debianutils/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/e2fsprogs/Makefile
===================================================================
--- trunk/busybox/e2fsprogs/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/e2fsprogs/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/editors/Makefile
===================================================================
--- trunk/busybox/editors/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/editors/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/findutils/Makefile
===================================================================
--- trunk/busybox/findutils/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/findutils/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/init/Makefile
===================================================================
--- trunk/busybox/init/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/init/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/libbb/Makefile
===================================================================
--- trunk/busybox/libbb/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/libbb/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/libpwdgrp/Makefile
===================================================================
--- trunk/busybox/libpwdgrp/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/libpwdgrp/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/loginutils/Makefile
===================================================================
--- trunk/busybox/loginutils/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/loginutils/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/miscutils/Makefile
===================================================================
--- trunk/busybox/miscutils/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/miscutils/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/modutils/Makefile
===================================================================
--- trunk/busybox/modutils/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/modutils/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/networking/Makefile
===================================================================
--- trunk/busybox/networking/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/networking/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/networking/libiproute/Makefile
===================================================================
--- trunk/busybox/networking/libiproute/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/networking/libiproute/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/networking/udhcp/Makefile
===================================================================
--- trunk/busybox/networking/udhcp/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/networking/udhcp/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/procps/Makefile
===================================================================
--- trunk/busybox/procps/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/procps/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/scripts/config/Makefile
===================================================================
--- trunk/busybox/scripts/config/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/scripts/config/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -2,8 +2,12 @@
 #
 # Copyright (C) 2002 Erik Andersen <andersen at codepoet.org>
 
+ifndef top_srcdir
 top_srcdir=../..
+endif
+ifndef top_builddir
 top_builddir=../..
+endif
 srcdir=$(top_srcdir)/scripts/config
 include $(top_srcdir)/Rules.mak
 

Modified: trunk/busybox/shell/Makefile
===================================================================
--- trunk/busybox/shell/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/shell/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/sysklogd/Makefile
===================================================================
--- trunk/busybox/sysklogd/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/sysklogd/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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

Modified: trunk/busybox/util-linux/Makefile
===================================================================
--- trunk/busybox/util-linux/Makefile	2006-03-02 16:41:04 UTC (rev 14428)
+++ trunk/busybox/util-linux/Makefile	2006-03-02 17:33:25 UTC (rev 14429)
@@ -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


