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/libpng | |
| 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/libpng')
| -rw-r--r-- | package/libpng/libpng.mk | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index d834876b3..2c18fdec9 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -12,25 +12,7 @@ LIBPNG_LICENSE = libpng license LIBPNG_LICENSE_FILES = LICENSE LIBPNG_INSTALL_STAGING = YES LIBPNG_DEPENDENCIES = host-pkgconf zlib - -define LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP - $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \ - -e "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include/libpng$(LIBPNG_SERIES)\',g" \ - -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \ - $(STAGING_DIR)/usr/bin/libpng$(LIBPNG_SERIES)-config -endef - -LIBPNG_POST_INSTALL_STAGING_HOOKS += LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP - -define LIBPNG_REMOVE_CONFIG_SCRIPTS - $(RM) -f $(TARGET_DIR)/usr/bin/libpng$(LIBPNG_SERIES)-config \ - $(TARGET_DIR)/usr/bin/libpng-config -endef - -ifneq ($(BR2_HAVE_DEVFILES),y) -LIBPNG_POST_INSTALL_TARGET_HOOKS += LIBPNG_REMOVE_CONFIG_SCRIPTS -endif +LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config $(eval $(autotools-package)) $(eval $(host-autotools-package)) |