aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/automake/automake.mk3
-rw-r--r--package/libtool/libtool.mk4
-rw-r--r--package/pkgconfig/pkgconfig.mk2
3 files changed, 8 insertions, 1 deletions
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index d65cd23388..6b87caa92c 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -20,7 +20,7 @@ AUTOMAKE_HOST_DIR:=$(BUILD_DIR)/automake-$(AUTOMAKE_VERSION)-host
# variables used by other packages
AUTOMAKE:=$(HOST_DIR)/usr/bin/automake
-ACLOCAL_DIR = $(HOST_DIR)/usr/share/aclocal
+ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
$(DL_DIR)/$(AUTOMAKE_SOURCE):
@@ -51,6 +51,7 @@ $(STAMP_DIR)/host_automake_compiled: $(STAMP_DIR)/host_automake_configured
$(STAMP_DIR)/host_automake_installed: $(STAMP_DIR)/host_automake_compiled
$(MAKE) -C $(AUTOMAKE_HOST_DIR) install
+ mkdir -p $(STAGING_DIR)/usr/share/aclocal
touch $@
host-automake: $(STAMP_DIR)/host_automake_installed
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index a649a7435d..1f56fdd3b1 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -49,6 +49,10 @@ $(STAMP_DIR)/host_libtool_compiled: $(STAMP_DIR)/host_libtool_configured
$(STAMP_DIR)/host_libtool_installed: $(STAMP_DIR)/host_libtool_compiled
$(MAKE) -C $(LIBTOOL_HOST_DIR) install
+ install -D -m 0644 $(HOST_DIR)/usr/share/aclocal/libtool.m4 \
+ $(STAGING_DIR)/usr/share/aclocal/libtool.m4
+ install -D -m 0644 $(HOST_DIR)/usr/share/aclocal/ltdl.m4 \
+ $(STAGING_DIR)/usr/share/aclocal/ltdl.m4
touch $@
host-libtool: $(STAMP_DIR)/host_libtool_installed
diff --git a/package/pkgconfig/pkgconfig.mk b/package/pkgconfig/pkgconfig.mk
index 7310aae504..34df017613 100644
--- a/package/pkgconfig/pkgconfig.mk
+++ b/package/pkgconfig/pkgconfig.mk
@@ -50,6 +50,8 @@ $(STAMP_DIR)/host_pkgconfig_compiled: $(STAMP_DIR)/host_pkgconfig_configured
$(STAMP_DIR)/host_pkgconfig_installed: $(STAMP_DIR)/host_pkgconfig_compiled
$(MAKE) -C $(PKG_CONFIG_HOST_DIR) install
+ install -D -m 0644 $(HOST_DIR)/usr/share/aclocal/pkg.m4 \
+ $(STAGING_DIR)/usr/share/aclocal/pkg.m4
touch $@
host-pkgconfig: $(STAMP_DIR)/host_pkgconfig_installed