diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/libpcap/libpcap.mk | 2 | ||||
| -rw-r--r-- | package/pkg-generic.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 5be61bf05..06aec0f4d 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -24,7 +24,7 @@ LIBPCAP_DEPENDENCIES = zlib LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \ ac_cv_header_linux_wireless_h=yes # configure misdetects this LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux -LIBPCAP_CONFIG_FIXUP = pcap-config +LIBPCAP_CONFIG_SCRIPTS = pcap-config ifeq ($(BR2_PACKAGE_LIBUSB),y) LIBPCAP_CONF_OPT += --enable-canusb diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 19a115ecd..066b6c863 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -128,12 +128,12 @@ $(BUILD_DIR)/%/.stamp_staging_installed: @$(call MESSAGE,"Installing to staging directory") $($(PKG)_INSTALL_STAGING_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) - $(Q)if test -n "$($(PKG)_CONFIG_FIXUP)" ; then \ + $(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \ $(call MESSAGE,"Fixing package configuration files") ;\ $(SED) "s,^\(exec_\)\?prefix=.*,\1prefix=$(STAGING_DIR)/usr,g" \ -e "s,-I/usr/,-I$(STAGING_DIR)/usr/,g" \ -e "s,-L/usr/,-L$(STAGING_DIR)/usr/,g" \ - $(addprefix $(STAGING_DIR)/usr/bin/,$($(PKG)_CONFIG_FIXUP)) ;\ + $(addprefix $(STAGING_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ;\ fi $(Q)touch $@ |