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/libpng/libpng.mk | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'package/libpng') 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)) -- cgit v1.2.3