diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-04-03 21:03:23 +0000 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-04-03 21:03:23 +0000 |
commit | b38bab526de0cd9084c90bd46c9168c4b4e2b968 (patch) | |
tree | e659f85be90136675de431b0d114418af921e42e /rules/connman.make | |
parent | f55e7487fd97329c218a0cbad55ebd3ec5df831b (diff) | |
download | ptxdist-b38bab526de0cd9084c90bd46c9168c4b4e2b968.tar.gz ptxdist-b38bab526de0cd9084c90bd46c9168c4b4e2b968.tar.xz |
[connman] remove pkg-config wrapper hacks
the pkg-config wrapper hacks are not needed anymore, because setting
PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT turns of prefixing paths with sysroot.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10218 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/connman.make')
-rw-r--r-- | rules/connman.make | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/rules/connman.make b/rules/connman.make index b277dce43..abe25c2a8 100644 --- a/rules/connman.make +++ b/rules/connman.make @@ -37,7 +37,9 @@ $(CONNMAN_SOURCE): # ---------------------------------------------------------------------------- CONNMAN_PATH := PATH=$(CROSS_PATH) -CONNMAN_ENV := $(CROSS_ENV) +CONNMAN_ENV := \ + $(CROSS_ENV) \ + PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT=y # # autoconf @@ -135,20 +137,6 @@ else CONNMAN_AUTOCONF += --disable-fake endif -$(STATEDIR)/connman.prepare: - @$(call targetinfo) - @$(call clean, $(CONNMAN_DIR)/config.cache) - cd $(CONNMAN_DIR) && \ - $(CONNMAN_PATH) $(CONNMAN_ENV) \ - ./configure $(CONNMAN_AUTOCONF) DBUS_DATADIR=/etc - # FIXME hack alert: configure.ac determines the sysconfdir, but - # our pkg-config-wrapper leaks the host path in - cd $(CONNMAN_DIR) && for i in $$(find . -name "Makefile"); do \ - sed -i -e "s/^DBUS_DATADIR =.*$$/DBUS_DATADIR = \/etc/g" $$i; \ - done - sed -i -e "s/^dbusdir =.*$$/dbusdir = \/etc\/dbus-1\/system.d/g" $(CONNMAN_DIR)/src/Makefile - @$(call touch) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- |