mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

groff: fix bindir transaction error

Browse Source 
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>
This commit is contained in:
Ming Liu
2014-07-03 17:30:01 +08:00
committed by Richard Purdie
parent 5f27f553eb
commit 42806c7c7b
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch
+39
View File
@@ -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
meta/recipes-extended/groff/groff_1.18.1.4.bb
+3 -1
View File
@@ -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