From 4d3f810aaf43aac7cb29ab6b875206da2a9a15b1 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 7 Feb 2013 12:35:06 +0000 Subject: package: use _CONFIG_SCRIPTS in packages that used special handling The packages changed by this commit were not only changing prefix= and exec_prefix= during their -config fixups, they were also changing includedir= and/or libdir=. So, they could not be directly converted to the new _CONFIG_SCRIPTS infrastructure. However, a careful analysis of their default -config shows that includedir= and libdir= is defined relatively to either ${prefix} and ${exec_prefix}. Therefore, the manual fixing of includedir= and libdir= is useless, and fixing prefix= and exec_prefix=, as done by the _CONFIG_SCRIPTS mechanism is sufficient. Signed-off-by: Thomas Petazzoni Acked-by: "Samuel Martin" Signed-off-by: Peter Korsgaard --- package/libxslt/libxslt.mk | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'package/libxslt') diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index a35b95507..b6c6aad8a 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -12,7 +12,7 @@ LIBXSLT_LICENSE_FILES = COPYING LIBXSLT_CONF_OPT = --with-gnu-ld --without-debug \ --without-python --with-libxml-prefix=$(STAGING_DIR)/usr/ - +LIBXSLT_CONFIG_SCRIPTS = xslt-config LIBXSLT_DEPENDENCIES = libxml2 # If we have enabled libgcrypt then use it, else disable crypto support. @@ -27,21 +27,5 @@ HOST_LIBXSLT_CONF_OPT = --without-debug --without-python --without-crypto HOST_LIBXSLT_DEPENDENCIES = host-libxml2 -define LIBXSLT_XSLT_CONFIG_FIXUP - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xslt-config - $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xslt-config - $(SED) "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" $(STAGING_DIR)/usr/bin/xslt-config -endef - -LIBXSLT_POST_INSTALL_STAGING_HOOKS += LIBXSLT_XSLT_CONFIG_FIXUP - -define LIBXSLT_REMOVE_CONFIG_SCRIPTS - $(RM) -f $(TARGET_DIR)/usr/bin/xslt-config -endef - -ifneq ($(BR2_HAVE_DEVFILES),y) -LIBXSLT_POST_INSTALL_TARGET_HOOKS += LIBXSLT_REMOVE_CONFIG_SCRIPTS -endif - $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- cgit v1.2.3