aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-12-11 03:15:10 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-12-11 03:15:10 +0000
commitbf9e9b6a9164a4085ec1dd4f5b47e0b0eb3b80b5 (patch)
tree3e147de15f1b81bb6ba3fb8e0bfff11f47a2b446
parent9337c975843175aaa51bd285080cb062eb1a3f45 (diff)
downloadupstream-bf9e9b6a9164a4085ec1dd4f5b47e0b0eb3b80b5.tar.gz
upstream-bf9e9b6a9164a4085ec1dd4f5b47e0b0eb3b80b5.tar.bz2
upstream-bf9e9b6a9164a4085ec1dd4f5b47e0b0eb3b80b5.zip
rework aclocal handling, packages have issues writing through the symlink so keep the host aclocal as include path for now
SVN-Revision: 24474
-rw-r--r--include/autotools.mk1
-rw-r--r--package/libtool/Makefile2
-rw-r--r--tools/Makefile3
3 files changed, 1 insertions, 5 deletions
diff --git a/include/autotools.mk b/include/autotools.mk
index d5f1e464c0..32b512e26c 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -25,6 +25,7 @@ define autoreconf
[ -f ./aclocal.m4 ] && [ ! -f ./acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \
[ -d ./autom4te.cache ] && rm -rf autom4te.cache; \
$(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
+ -B $(STAGING_DIR_HOST)/share/aclocal \
-B $(STAGING_DIR)/host/share/aclocal \
$(patsubst %,-I %,$(PKG_LIBTOOL_PATHS)) $(PKG_LIBTOOL_PATHS) || true; \
fi \
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 4986f5614e..5aa5aa3652 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -48,8 +48,6 @@ define Build/InstallDev
$(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(2)/bin/libtool
$(CP) $(2)/bin/libtool $(2)/bin/libtool-ucxx
$(SED) 's,-lstdc++,-luClibc++,g' $(2)/bin/libtool-ucxx
- [ -h $(STAGING_DIR)/host/share/aclocal ] && \
- rm -rf $(TMP_DIR)/stage-$(PKG_NAME)/host/share/aclocal || true
endef
define Package/libltdl/install
diff --git a/tools/Makefile b/tools/Makefile
index 91f52ff29a..7f22591dcc 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -65,9 +65,6 @@ endef
# preparatory work
$(STAGING_DIR)/.prepared: $(TMP_DIR)/.build $(STAGING_DIR_HOST)/.prepared
$(call PrepareStaging,$(STAGING_DIR))
- mkdir -p $(STAGING_DIR)/host/share
- rm -rf $(STAGING_DIR)/host/share/aclocal
- ln -s $(STAGING_DIR_HOST)/share/aclocal $(STAGING_DIR)/host/share/
mkdir -p $(BUILD_DIR)/stamp
touch $@