summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <ming.liu@windriver.com>2014-07-03 17:30:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-08 11:20:12 +0100
commit42806c7c7b2024273ac249ff4be3c51f69a60aa7 (patch)
tree57fd24fceed1b78935d7e7882d3d3cad0922c104
parent5f27f553ebfe4b4c4e47b44d42466a7992bd66b9 (diff)
downloadpoky-42806c7c7b2024273ac249ff4be3c51f69a60aa7.tar.gz
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>
-rw-r--r--meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch39
-rw-r--r--meta/recipes-extended/groff/groff_1.18.1.4.bb4
2 files changed, 42 insertions, 1 deletions
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
index 0000000000..559ae72898
--- /dev/null
+++ b/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch
@@ -0,0 +1,39 @@
1Upstream-Status: Inappropriate [embedded]
2
3Signed-off-by: Ming Liu <ming.liu@windriver.com>
4---
5 Makefile.sub | 10 +++++-----
6 1 file changed, 5 insertions(+), 5 deletions(-)
7
8--- a/contrib/groffer/Makefile.sub
9+++ b/contrib/groffer/Makefile.sub
10@@ -38,16 +38,16 @@ groffer: groffer.sh groffer2.sh version.
11 $(RM) $@;
12 sed \
13 -e "s|@g@|$(g)|g" \
14- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
15+ -e "s|@BINDIR@|$(bindir)|g" \
16 -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
17 -e "s|@VERSION@|$(version)$(revision)|g" \
18 $(srcdir)/groffer.sh >$@;
19 chmod +x $@
20
21 install_data: groffer
22- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
23- -$(RM) $(DESTDIR)$(bindir)/groffer
24- $(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer
25+ -test -d $(bindir) || $(mkinstalldirs) $(bindir)
26+ -$(RM) $(bindir)/groffer
27+ $(INSTALL_SCRIPT) groffer $(bindir)/groffer
28 -test -d $(DESTDIR)$(libdir)/groff/groffer || \
29 $(mkinstalldirs) $(DESTDIR)$(libdir)/groff/groffer
30 -$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh
31@@ -58,7 +58,7 @@ install_data: groffer
32 $(DESTDIR)$(libdir)/groff/groffer/version.sh
33
34 uninstall_sub:
35- -$(RM) $(DESTDIR)$(bindir)/groffer
36+ -$(RM) $(bindir)/groffer
37 -$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh
38 -$(RM) $(DESTDIR)$(libdir)/groff/groffer/version.sh
39 -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 687194909e..38e1d36b83 100644
--- 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"
11SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ 11SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
12 file://groff-1.18.1.4-remove-mom.patch;striplevel=1 \ 12 file://groff-1.18.1.4-remove-mom.patch;striplevel=1 \
13 file://man-local.patch \ 13 file://man-local.patch \
14 file://mdoc-local.patch" 14 file://mdoc-local.patch \
15 file://groff-1.18.1.4-fix-bindir.patch \
16"
15 17
16inherit autotools texinfo 18inherit autotools texinfo
17 19