groff: fix bindir transaction error

bindir is transfered to Makefile as ${D}${bindir}, hence it should not
use DESTDIR as the prefix directory any more during the install.

(From OE-Core rev: c050e5c9490e9e8e07db7fbd5e6c1e1dbef3bf8c)

Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch b/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch
new file mode 100644 (file)
index 0000000..559ae72
--- /dev/null
+++ b/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch
@@ -0,0 +1,39 @@
+Upstream-Status: Inappropriate [embedded]
+
+Signed-off-by: Ming Liu <ming.liu@windriver.com>
+---
+ Makefile.sub |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/contrib/groffer/Makefile.sub
++++ b/contrib/groffer/Makefile.sub
+@@ -38,16 +38,16 @@ groffer: groffer.sh groffer2.sh version.
+       $(RM) $@;
+       sed \
+             -e "s|@g@|$(g)|g" \
+-          -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
++          -e "s|@BINDIR@|$(bindir)|g" \
+           -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
+           -e "s|@VERSION@|$(version)$(revision)|g" \
+           $(srcdir)/groffer.sh >$@;
+       chmod +x $@
+ 
+ install_data: groffer
+-      -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+-      -$(RM) $(DESTDIR)$(bindir)/groffer
+-      $(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer
++      -test -d $(bindir) || $(mkinstalldirs) $(bindir)
++      -$(RM) $(bindir)/groffer
++      $(INSTALL_SCRIPT) groffer $(bindir)/groffer
+       -test -d $(DESTDIR)$(libdir)/groff/groffer || \
+           $(mkinstalldirs) $(DESTDIR)$(libdir)/groff/groffer
+       -$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh
+@@ -58,7 +58,7 @@ install_data: groffer
+       $(DESTDIR)$(libdir)/groff/groffer/version.sh
+ 
+ uninstall_sub:
+-      -$(RM) $(DESTDIR)$(bindir)/groffer
++      -$(RM) $(bindir)/groffer
+       -$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh
+       -$(RM) $(DESTDIR)$(libdir)/groff/groffer/version.sh
+       -rmdir $(DESTDIR)$(libdir)/groff/groffer

diff --git a/meta/recipes-extended/groff/groff_1.18.1.4.bb b/meta/recipes-extended/groff/groff_1.18.1.4.bb
index 6871949..38e1d36 100644 (file)
--- a/meta/recipes-extended/groff/groff_1.18.1.4.bb
+++ b/meta/recipes-extended/groff/groff_1.18.1.4.bb
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e43fc16fccd8519fba405f0a0ff6e8a3"
 SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
           file://groff-1.18.1.4-remove-mom.patch;striplevel=1 \
           file://man-local.patch \
-          file://mdoc-local.patch" 
+          file://mdoc-local.patch \
+          file://groff-1.18.1.4-fix-bindir.patch \
+" 
 
 inherit autotools texinfo