Commit a5ce8576 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

package: use <pkg>_CONFIG_SCRIPTS wherever possible 



Use the <pkg>_CONFIG_SCRIPTS mechanism in all packages for which it
does all what the package was doing. A few packages, like libxslt, are
for now left out, since they need some additional fixup (for example a
fixup of includedir).

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 580225af

package/cups/cups.mk

+1 −9
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ CUPS_CONF_OPT = --without-perl \ 
		--disable-gnutls \

		--disable-gssapi \

		--libdir=/usr/lib

CUPS_CONFIG_SCRIPTS = cups-config



CUPS_DEPENDENCIES = $(if $(BR2_PACKAGE_ZLIB),zlib) \

		    $(if $(BR2_PACKAGE_LIBPNG),libpng) \
@@ -61,13 +62,4 @@ CUPS_DEPENDENCIES += host-autoconf 


CUPS_PRE_CONFIGURE_HOOKS += CUPS_FIXUP_AUTOCONF



# Fixup prefix= and exec_prefix= in cups-config

define CUPS_FIXUP_CUPS_CONFIG

	$(SED) 's%^prefix=/usr%prefix=$(STAGING_DIR)/usr%' \

		-e 's%^exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \

		$(STAGING_DIR)/usr/bin/cups-config

endef



CUPS_POST_INSTALL_STAGING_HOOKS += CUPS_FIXUP_CUPS_CONFIG



$(eval $(autotools-package))

package/directfb/directfb.mk

+1 −8
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ DIRECTFB_CONF_OPT = \ 
	--disable-video4linux \

	--disable-video4linux2 \

	--without-tools

DIRECTFB_CONFIG_SCRIPTS = directfb-config



DIRECTFB_DEPENDENCIES = freetype zlib
@@ -131,14 +132,6 @@ HOST_DIRECTFB_BUILD_CMDS = \ 
HOST_DIRECTFB_INSTALL_CMDS = \

	$(INSTALL) -m 0755 $(@D)/tools/directfb-csource $(HOST_DIR)/usr/bin



define DIRECTFB_STAGING_CONFIG_FIXUP

	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \

		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \

		$(STAGING_DIR)/usr/bin/directfb-config

endef



DIRECTFB_POST_INSTALL_STAGING_HOOKS += DIRECTFB_STAGING_CONFIG_FIXUP



$(eval $(autotools-package))

$(eval $(host-autotools-package))

package/divine/divine.mk

+1 −8
Original line number Diff line number Diff line
@@ -9,13 +9,6 @@ DIVINE_SITE = http://www.directfb.org/downloads/Extras 
DIVINE_SOURCE = DiVine-$(DIVINE_VERSION).tar.gz

DIVINE_INSTALL_STAGING = YES

DIVINE_DEPENDENCIES = directfb



define DIVINE_STAGING_DIVINE_CONFIG_FIXUP

	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \

		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \

		$(STAGING_DIR)/usr/bin/divine-config

endef



DIVINE_POST_INSTALL_STAGING_HOOKS += DIVINE_STAGING_DIVINE_CONFIG_FIXUP

DIVINE_CONFIG_SCRIPTS = divine-config



$(eval $(autotools-package))

package/gd/gd.mk

+1 −9
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ GD_INSTALL_STAGING = YES 
GD_LICENSE = GD license

GD_LICENSE_FILES = COPYING



GD_CONFIG_SCRIPTS = gdlib-config

GD_CONF_OPT = --without-x --disable-rpath



ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
@@ -66,15 +67,6 @@ endef 
GD_PRE_CONFIGURE_HOOKS += GD_FIXUP_ICONV

endif



define GD_FIXUP_GDLIB_CONFIG

	$(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \

	    -e 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \

		$(STAGING_DIR)/usr/bin/gdlib-config

endef



GD_POST_INSTALL_STAGING_HOOKS += GD_FIXUP_GDLIB_CONFIG



GD_TOOLS_                         	+= gdlib-config

GD_TOOLS_$(BR2_PACKAGE_GD_ANNOTATE)	+= annotate

GD_TOOLS_$(BR2_PACKAGE_GD_BDFTOGD)	+= bdftogd

GD_TOOLS_$(BR2_PACKAGE_GD_GD2COPYPAL)	+= gd2copypal

package/giblib/giblib.mk

+1 −8
Original line number Diff line number Diff line
@@ -12,13 +12,6 @@ GIBLIB_AUTORECONF = YES 
GIBLIB_AUTORECONF_OPT = --install

GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING_DIR)/usr \

		  --with-imlib2-exec-prefix=$(STAGING_DIR)/usr



define GIBLIB_STAGING_GIBLIB_CONFIG_FIXUP

	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \

		-e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \

		$(STAGING_DIR)/usr/bin/giblib-config

endef



GIBLIB_POST_INSTALL_STAGING_HOOKS += GIBLIB_STAGING_GIBLIB_CONFIG_FIXUP

GIBLIB_CONFIG_SCRIPTS = giblib-config



$(eval $(autotools-package))