summaryrefslogtreecommitdiffstats
path: root/rules/xorg-app-xinit.make
diff options
context:
space:
mode:
authorLuotao Fu <l.fu@pengutronix.de>2007-01-23 16:26:26 +0000
committerLuotao Fu <l.fu@pengutronix.de>2007-01-23 16:26:26 +0000
commit1ee8eb95f7360277ae5ee3db0435e585656ca797 (patch)
tree829687875a9fa329b568851fae11cc4df7f2e387 /rules/xorg-app-xinit.make
parent81aad7ecd8028a45ec062ae50f63e9d69e83828e (diff)
downloadptxdist-1ee8eb95f7360277ae5ee3db0435e585656ca797.tar.gz
ptxdist-1ee8eb95f7360277ae5ee3db0435e585656ca797.tar.xz
*startx now loads xinitrc from etc/X11/xinit *cross compiling with cross cpp
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6892 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/xorg-app-xinit.make')
-rw-r--r--rules/xorg-app-xinit.make7
1 files changed, 5 insertions, 2 deletions
diff --git a/rules/xorg-app-xinit.make b/rules/xorg-app-xinit.make
index e1836d69a..5cfa32d8e 100644
--- a/rules/xorg-app-xinit.make
+++ b/rules/xorg-app-xinit.make
@@ -59,7 +59,10 @@ $(STATEDIR)/xorg-app-xinit.extract: $(xorg-app-xinit_extract_deps_default)
xorg-app-xinit_prepare: $(STATEDIR)/xorg-app-xinit.prepare
XORG_APP_XINIT_PATH := PATH=$(CROSS_PATH)
-XORG_APP_XINIT_ENV := $(CROSS_ENV)
+XORG_APP_XINIT_ENV := $(CROSS_ENV)
+XORG_APP_XINIT_MAKEVARS := XINITDIR=/etc/X11/xinit \
+ RAWCPP=$(COMPILER_PREFIX)cpp
+ #FIXME: damm ugly hack, should fix cpp check in configure instead
#
# autoconf
@@ -100,7 +103,7 @@ xorg-app-xinit_compile: $(STATEDIR)/xorg-app-xinit.compile
$(STATEDIR)/xorg-app-xinit.compile: $(xorg-app-xinit_compile_deps_default)
@$(call targetinfo, $@)
- cd $(XORG_APP_XINIT_DIR) && $(XORG_APP_XINIT_PATH) make
+ cd $(XORG_APP_XINIT_DIR) && $(XORG_APP_XINIT_PATH) $(MAKE) $(XORG_APP_XINIT_MAKEVARS)
@$(call touch, $@)
# ----------------------------------------------------------------------------