diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index c327b4fa3..cedd667c5 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -13,9 +13,19 @@ PROCPS_NG_INSTALL_STAGING = YES PROCPS_NG_DEPENDENCIES = ncurses +# If both procps-ng and busybox are selected, make certain procps-ng +# wins the fight over who gets to have their utils actually installed. +ifeq ($(BR2_PACKAGE_BUSYBOX),y) +PROCPS_NG_DEPENDENCIES += busybox +endif + ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) PROCPS_NG_DEPENDENCIES += gettext PROCPS_NG_CONF_OPT += LIBS=-lintl endif +# We need this to make procps-ng binaries installed in $(TARGET_DIR)/usr +# instead of $(TARGET_DIR)/usr/usr +PROCPS_NG_CONF_OPT += --exec-prefix= + $(eval $(autotools-package))