summaryrefslogtreecommitdiffstats
path: root/rules/blackbox.make
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2006-02-27 22:16:40 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2006-02-27 22:16:40 +0000
commit4810665bcd1a03f95f1d2dfa9cf659705bbd7bdf (patch)
treee71fcfecf009678dd28b56ff49bc06d31e15ba3d /rules/blackbox.make
parent427d0f0d23436f3091d513a19f7d63b56efe13f3 (diff)
downloadptxdist-4810665bcd1a03f95f1d2dfa9cf659705bbd7bdf.tar.gz
ptxdist-4810665bcd1a03f95f1d2dfa9cf659705bbd7bdf.tar.xz
unbroken
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@4795 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/blackbox.make')
-rw-r--r--rules/blackbox.make15
1 files changed, 6 insertions, 9 deletions
diff --git a/rules/blackbox.make b/rules/blackbox.make
index bc4f8e96c..61825f3b7 100644
--- a/rules/blackbox.make
+++ b/rules/blackbox.make
@@ -50,6 +50,7 @@ $(STATEDIR)/blackbox.extract: $(blackbox_extract_deps_default)
@$(call targetinfo, $@)
@$(call clean, $(BLACKBOX_DIR))
@$(call extract, $(BLACKBOX_SOURCE))
+ @$(call patchin, $(BLACKBOX))
@$(call touch, $@)
# ----------------------------------------------------------------------------
@@ -64,14 +65,8 @@ BLACKBOX_ENV = $(CROSS_ENV)
#
# autoconf
#
-BLACKBOX_AUTOCONF = $(CROSS_AUTOCONF_USR)
-BLACKBOX_AUTOCONF += -disable-nls
-
-BLACKBOX_AUTOCONF += --x-includes=/home/koan/ptxdist/ptxdist-testing/root/usr/X11R6/include
-BLACKBOX_AUTOCONF += --x-libraries=/home/koan/ptxdist/ptxdist-testing/root/usr/X11R6/lib
-
-#BLACKBOX_AUTOCONF += --x-includes=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include/X11 \
-#BLACKBOX_AUTOCONF += --x-libraries=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib \
+BLACKBOX_AUTOCONF = $(CROSS_AUTOCONF_USR)
+BLACKBOX_AUTOCONF += --x-includes=$(SYSROOT)/usr/include
$(STATEDIR)/blackbox.prepare: $(blackbox_prepare_deps_default)
@$(call targetinfo, $@)
@@ -89,7 +84,9 @@ blackbox_compile: $(STATEDIR)/blackbox.compile
$(STATEDIR)/blackbox.compile: $(blackbox_compile_deps_default)
@$(call targetinfo, $@)
- $(BLACKBOX_PATH) make -C $(BLACKBOX_DIR)
+ cd $(BLACKBOX_DIR) && \
+ $(BLACKBOX_PATH) $(BLACKBOX_ENV) \
+ make $(BLACKBOX_MAKEVARS)
@$(call touch, $@)
# ----------------------------------------------------------------------------