diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-02 17:33:25 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-03-02 17:33:25 +0000 |
commit | 022eb311d57ba252423c3dc4398cda1d41ae986c (patch) | |
tree | 7be09f0f57ca820b27b6b397d8e2c0f8f33212c4 /archival | |
parent | c0bb308389d448d7564ac6034edbbb117b4744fc (diff) | |
download | busybox-w32-022eb311d57ba252423c3dc4398cda1d41ae986c.tar.gz busybox-w32-022eb311d57ba252423c3dc4398cda1d41ae986c.tar.bz2 busybox-w32-022eb311d57ba252423c3dc4398cda1d41ae986c.zip |
- use absolute path for top_builddir and top_srcdir.
Fixes make trying to include the very same file in an endless loop.
Diffstat (limited to 'archival')
-rw-r--r-- | archival/Makefile | 4 | ||||
-rw-r--r-- | archival/libunarchive/Makefile | 4 |
2 files changed, 8 insertions, 0 deletions
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 | ||
7 | ifndef top_srcdir | ||
7 | top_srcdir=.. | 8 | top_srcdir=.. |
9 | endif | ||
10 | ifndef top_builddir | ||
8 | top_builddir=.. | 11 | top_builddir=.. |
12 | endif | ||
9 | ARCHIVAL_DIR:=./ | 13 | ARCHIVAL_DIR:=./ |
10 | srcdir=$(top_srcdir)/archival | 14 | srcdir=$(top_srcdir)/archival |
11 | include $(top_builddir)/Rules.mak | 15 | 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 @@ | |||
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 | ||
20 | ifndef top_srcdir | ||
20 | top_srcdir=../.. | 21 | top_srcdir=../.. |
22 | endif | ||
23 | ifndef top_builddir | ||
21 | top_builddir=../.. | 24 | top_builddir=../.. |
25 | endif | ||
22 | srcdir=$(top_srcdir)/archival/libunarchive | 26 | srcdir=$(top_srcdir)/archival/libunarchive |
23 | LIBUNARCHIVE_DIR:=./ | 27 | LIBUNARCHIVE_DIR:=./ |
24 | include $(top_builddir)/Rules.mak | 28 | include $(top_builddir)/Rules.mak |