Bläddra i källkod

util-linux: fix install when locales are enabled

util-linux uses mkinstalldirs to install .po files when locales are
enabled, but the definition of MKINSTALLDIRS comes from a tweaked
nls.m4 (based on the one from gettext).

When we autoreconf the package, we end up using the system (staging)
version of nls.m4, so MKINSTALLDIRS doesn't get defined.

Fix it by passing a definition of MKINSTALLDIRS to make during the
install steps.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 14 år sedan
förälder
incheckning
71f279f9a2
1 ändrade filer med 5 tillägg och 0 borttagningar
  1. 5 0
      package/util-linux/util-linux.mk

+ 5 - 0
package/util-linux/util-linux.mk

@@ -68,3 +68,8 @@ UTIL_LINUX_CONF_OPT += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write)
 	$(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write)
 
 
 $(eval $(call AUTOTARGETS,package,util-linux))
 $(eval $(call AUTOTARGETS,package,util-linux))
+
+# MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
+# one, so it disappears
+UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
+UTIL_LINUX_INSTALL_TARGET_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs