From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 29 Jan 2020 11:38:07 +0000 (+0000)
Subject: texinfo-dummy-native: Allow to coexist with texinfo-native
X-Git-Tag: uninative-2.8~365
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0a1099d7d346d540b616f88f30ebaf1571d9eba1;p=openembedded-core.git

texinfo-dummy-native: Allow to coexist with texinfo-native

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
index 1254bc89b4..3732d4fa7b 100644
--- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
+++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
@@ -13,15 +13,19 @@ NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
 
 inherit native
 
+#
+# To avoid texinfo-dummy-native and texinfo-native conflicting we install to base_bindir
+# which is later in PATH than bindir where texinfo-native installs
+#
 do_install_name() {
-    FILENAME="${D}${bindir}/$1"
+    FILENAME="${D}${base_bindir}/$1"
     # Using ln causes problems with rm_work
     cp -T "${S}/template.py" "$FILENAME"
     chmod +x $FILENAME
 }
 
 do_install() {
-    mkdir -p "${D}${bindir}"
+    mkdir -p "${D}${base_bindir}"
     for i in makeinfo pod2texi texi2dvi pdftexi2dvi texindex texi2pdf \
              txixml2texi texi2any install-info ginstall-info \
              update-info-dir; do