Patchwork libuser: Use abs_srcdir instead of srcdir

login
register
mail settings
Submitter Khem Raj
Date March 23, 2013, 6:42 a.m.
Message ID <1364020945-22616-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/46775/
State Accepted
Commit 9297e01b2095d90b5365d23c10de699a7cf411ea
Headers show

Comments

Khem Raj - March 23, 2013, 6:42 a.m.
srcdir is still relative to pwd. We need to use
abs_srcdir to get absolute source directory names

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../libuser/libuser/fixsepbuild.patch              |   27 +++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

Patch

diff --git a/meta/recipes-extended/libuser/libuser/fixsepbuild.patch b/meta/recipes-extended/libuser/libuser/fixsepbuild.patch
index 27e6bc6..893ca14 100644
--- a/meta/recipes-extended/libuser/libuser/fixsepbuild.patch
+++ b/meta/recipes-extended/libuser/libuser/fixsepbuild.patch
@@ -6,21 +6,30 @@  Upstream-Status: Pending
 
 RP 2013/03/21
 
-Index: libuser/docs/Makefile.am
+Index: libuser-0.58/docs/Makefile.am
 ===================================================================
---- libuser/docs.orig/Makefile.am	2012-11-08 02:25:58.000000000 +0000
-+++ libuser/docs/Makefile.am	2013-03-21 14:15:40.756950231 +0000
-@@ -13,9 +13,9 @@
- 		< $(srcdir)/libuser.conf.5.in > $@
+--- libuser-0.58.orig/docs/Makefile.am	2012-11-07 18:25:58.000000000 -0800
++++ libuser-0.58/docs/Makefile.am	2013-03-22 23:32:06.843518069 -0700
+@@ -8,14 +8,14 @@
  
- sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml
+ all: sgml/libuser.txt sgml/libuser.html
+ 
+-libuser.conf.5: $(srcdir)/libuser.conf.5.in Makefile
++libuser.conf.5: $(abs_srcdir)/libuser.conf.5.in Makefile
+ 	sed 's,@sysconfdir\@,$(sysconfdir),g' \
+-		< $(srcdir)/libuser.conf.5.in > $@
++		< $(abs_srcdir)/libuser.conf.5.in > $@
+ 
+-sgml/libuser.txt: $(srcdir)/sgml/libuser.sgml
 -	[ -d sgml ] || mkdir sgml
 -	cd sgml; sgml2txt ../$(srcdir)/sgml/libuser.sgml
++sgml/libuser.txt: $(abs_srcdir)/sgml/libuser.sgml
 +	[ -d sgml ] || mkdir sgml || true
-+	cd sgml; sgml2txt $(srcdir)/sgml/libuser.sgml
++	cd sgml; sgml2txt $(abs_srcdir)/sgml/libuser.sgml
  
- sgml/libuser.html: $(srcdir)/sgml/libuser.sgml
+-sgml/libuser.html: $(srcdir)/sgml/libuser.sgml
 -	[ -d sgml ] || mkdir sgml
 -	cd sgml; sgml2html ../$(srcdir)/sgml/libuser.sgml
++sgml/libuser.html: $(abs_srcdir)/sgml/libuser.sgml
 +	[ -d sgml ] || mkdir sgml || true
-+	cd sgml; sgml2html $(srcdir)/sgml/libuser.sgml
++	cd sgml; sgml2html $(abs_srcdir)/sgml/libuser.sgml