diff options
Diffstat (limited to 'package/autoconf')
| -rw-r--r-- | package/autoconf/autoconf.mk | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index a6bf8bfde..2157fbeb6 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -15,7 +15,7 @@ AUTOCONF_TARGET_BINARY:=usr/bin/autoconf AUTOCONF:=$(STAGING_DIR)/usr/bin/autoconf # variables used by other packages -AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" autoreconf -v -f -i -I "$(ACLOCAL_DIR)" +AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" autoreconf -v -f -i -I "$(ACLOCAL_DIR)" $(DL_DIR)/$(AUTOCONF_SOURCE): $(WGET) -P $(DL_DIR) $(AUTOCONF_SITE)/$(AUTOCONF_SOURCE) @@ -51,8 +51,8 @@ $(AUTOCONF_DIR)/.configured: $(AUTOCONF_SRC_DIR)/.unpacked --sysconfdir=/etc \ --datadir=/usr/share \ --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ ) touch $@ @@ -70,12 +70,18 @@ $(TARGET_DIR)/$(AUTOCONF_TARGET_BINARY): $(AUTOCONF_DIR)/bin/$(AUTOCONF_BINARY) sysconfdir=$(TARGET_DIR)/etc \ localstatedir=$(TARGET_DIR)/var \ libdir=$(TARGET_DIR)/usr/lib \ - infodir=$(TARGET_DIR)/usr/info \ - mandir=$(TARGET_DIR)/usr/man \ + infodir=$(TARGET_DIR)/usr/share/info \ + mandir=$(TARGET_DIR)/usr/share/man \ includedir=$(TARGET_DIR)/usr/include \ -C $(AUTOCONF_DIR) install - rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc +ifneq ($(BR2_HAVE_INFOPAGES),y) + rm -rf $(TARGET_DIR)/usr/share/info +endif +ifneq ($(BR2_HAVE_MANPAGES),y) + rm -rf $(TARGET_DIR)/usr/share/man +endif + rm -rf $(TARGET_DIR)/share/locale + rm -rf $(TARGET_DIR)/usr/share/doc touch -c $@ autoconf: uclibc $(TARGET_DIR)/$(AUTOCONF_TARGET_BINARY) |