summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-03-22 23:42:25 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-23 09:53:00 +0000
commit2143c9965e714eb4b8642f5e23875a4d9b150082 (patch)
treed74aedb3733b62bac69ded4d19ccb4da9673085b
parent031305f8472be6e8eda7b130cb7409acf9a1984a (diff)
downloadpoky-2143c9965e714eb4b8642f5e23875a4d9b150082.tar.gz
libuser: Use abs_srcdir instead of srcdir
srcdir is still relative to pwd. We need to use abs_srcdir to get absolute source directory names (From OE-Core rev: 9297e01b2095d90b5365d23c10de699a7cf411ea) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/libuser/libuser/fixsepbuild.patch27
1 files changed, 18 insertions, 9 deletions
diff --git a/meta/recipes-extended/libuser/libuser/fixsepbuild.patch b/meta/recipes-extended/libuser/libuser/fixsepbuild.patch
index 27e6bc6ff1..893ca1490b 100644
--- a/meta/recipes-extended/libuser/libuser/fixsepbuild.patch
+++ b/meta/recipes-extended/libuser/libuser/fixsepbuild.patch
@@ -6,21 +6,30 @@ Upstream-Status: Pending
6 6
7RP 2013/03/21 7RP 2013/03/21
8 8
9Index: libuser/docs/Makefile.am 9Index: libuser-0.58/docs/Makefile.am
10=================================================================== 10===================================================================
11--- libuser/docs.orig/Makefile.am 2012-11-08 02:25:58.000000000 +0000 11--- libuser-0.58.orig/docs/Makefile.am 2012-11-07 18:25:58.000000000 -0800
12+++ libuser/docs/Makefile.am 2013-03-21 14:15:40.756950231 +0000 12+++ libuser-0.58/docs/Makefile.am 2013-03-22 23:32:06.843518069 -0700
13@@ -13,9 +13,9 @@ 13@@ -8,14 +8,14 @@
14 < $(srcdir)/libuser.conf.5.in > $@
15 14
16 sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml 15 all: sgml/libuser.txt sgml/libuser.html
16
17-libuser.conf.5: $(srcdir)/libuser.conf.5.in Makefile
18+libuser.conf.5: $(abs_srcdir)/libuser.conf.5.in Makefile
19 sed 's,@sysconfdir\@,$(sysconfdir),g' \
20- < $(srcdir)/libuser.conf.5.in > $@
21+ < $(abs_srcdir)/libuser.conf.5.in > $@
22
23-sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml
17- [ -d sgml ] || mkdir sgml 24- [ -d sgml ] || mkdir sgml
18- cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml 25- cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml
26+sgml/libuser.txt: $(abs_srcdir)/sgml/libuser.sgml
19+ [ -d sgml ] || mkdir sgml || true 27+ [ -d sgml ] || mkdir sgml || true
20+ cd sgml; sgml2txt $(srcdir)/sgml/libuser.sgml 28+ cd sgml; sgml2txt $(abs_srcdir)/sgml/libuser.sgml
21 29
22 sgml/libuser.html: $(srcdir)/sgml/libuser.sgml 30-sgml/libuser.html: $(srcdir)/sgml/libuser.sgml
23- [ -d sgml ] || mkdir sgml 31- [ -d sgml ] || mkdir sgml
24- cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml 32- cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml
33+sgml/libuser.html: $(abs_srcdir)/sgml/libuser.sgml
25+ [ -d sgml ] || mkdir sgml || true 34+ [ -d sgml ] || mkdir sgml || true
26+ cd sgml; sgml2html $(srcdir)/sgml/libuser.sgml 35+ cd sgml; sgml2html $(abs_srcdir)/sgml/libuser.sgml