diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-02-07 12:35:06 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-02-08 22:40:49 +0100 |
| commit | 4d3f810aaf43aac7cb29ab6b875206da2a9a15b1 (patch) | |
| tree | a6232b02636a31d2a7931ae97de125dc4c8d0a80 /package/libxslt | |
| parent | a5ce8576748421b6dece97a665e575d7dfc9fbe8 (diff) | |
| download | buildroot-novena-4d3f810aaf43aac7cb29ab6b875206da2a9a15b1.tar.gz buildroot-novena-4d3f810aaf43aac7cb29ab6b875206da2a9a15b1.zip | |
package: use <pkg>_CONFIG_SCRIPTS in packages that used special handling
The packages changed by this commit were not only changing prefix= and
exec_prefix= during their <foo>-config fixups, they were also changing
includedir= and/or libdir=. So, they could not be directly converted
to the new <pkg>_CONFIG_SCRIPTS infrastructure.
However, a careful analysis of their default <foo>-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 <pkg>_CONFIG_SCRIPTS mechanism is sufficient.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Samuel Martin" <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/libxslt')
| -rw-r--r-- | package/libxslt/libxslt.mk | 18 |
1 files changed, 1 insertions, 17 deletions
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)) |