On Mon, Dec 20, 2010 at 02:41:18PM +0100, Sumit Bose wrote:
On Mon, Dec 20, 2010 at 01:46:49PM +0100, Sumit Bose wrote:
> On Fri, Dec 17, 2010 at 09:19:56AM -0500, Stephen Gallagher wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > On 12/16/2010 08:51 AM, Jakub Hrozek wrote:
> > > On 12/16/2010 01:31 PM, Stephen Gallagher wrote:
> > >> On 12/16/2010 06:36 AM, Jakub Hrozek wrote:
> > >>> On 12/15/2010 09:48 PM, Stephen Gallagher wrote:
> > >>>> Nack. These patches fail to build when configure is run in a
directory
> > >>>> other than the root of the source checkout (aka a parallel
build directory)
> > >
> > >>>> See attached build log attempting to build from
/dev/shm/test-build.
> > >
> > >
> > >>> Thanks, I missed this case in my testing (or rather, I though that
make
> > >>> distcheck does essentially the same thing).
> > >
> > >>> Attached is a patch that always builds the included xml files as
the
> > >>> real xml sources depend on them.
> > >
> > >
> > >> Nack. Running "make translated-manpages" now works in a
parallel build
> > >> dir, but running "make distcheck" still fails.
> > >
> > >> Logs attached.
> > >
> > >> distcheck-clean.log shows the attempt to run "make
distcheck" from a
> > >> perfectly clean checkout with this patch (patch applied, then 'git
reset
> > >> --hard' to make sure there are no pre-generated translation
files)
> > >
> > >> distcheck-translated-manpages shows the attempt to run "make
distcheck"
> > >> from a checkout that was configured and then had "make
> > >> translated-manpages" run on it.
> > >
> > >> Both of these were run from a parallel build dir.
> > >
> > >
> > >
> > > Sumit managed to fix this issue. Attached is my previous patch with his
fix.
> >
> >
> >
> > Nack. Patch does not update translations when "make distdir" is run.
> > This is needed for ensuring that releases always have the latest
> > translation data available.
> >
>
> The attached patch should fix it, please apply it on top of the other
> two.
>
> bye,
> Sumit
Here is a different version of the patch with the distdir-hook target
instead of dist-hook.
bye,
Sumit
Another new version which can create a missing po directory.
bye,
Sumit
>
> >
> > - --
> > Stephen Gallagher
> > RHCE 804006346421761
> >
> > Delivering value year after year.
> > Red Hat ranks #1 in value among software vendors.
> >
http://www.redhat.com/promo/vendor/
> > -----BEGIN PGP SIGNATURE-----
> > Version: GnuPG v1.4.11 (GNU/Linux)
> > Comment: Using GnuPG with Fedora -
http://enigmail.mozdev.org/
> >
> > iEYEARECAAYFAk0LcYwACgkQeiVVYja6o6NYYwCfY2J60KRcT5VNHvd88cjAgMjW
> > XnMAn0qjI7QBkZsakuYXQ1sIKJarycwb
> > =dqh8
> > -----END PGP SIGNATURE-----
> >
_______________________________________________
> > sssd-devel mailing list
> > sssd-devel(a)lists.fedorahosted.org
> >
https://fedorahosted.org/mailman/listinfo/sssd-devel
From 7be9f787dff5af9fe24218e093a840dce5e8407b Mon Sep 17 00:00:00
2001
From: Sumit Bose <sbose(a)redhat.com>
Date: Mon, 20 Dec 2010 13:42:07 +0100
Subject: [PATCH] Update man pages pot file during make dist
---
src/man/Makefile.am | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/man/Makefile.am b/src/man/Makefile.am
index f66babe..2f2b295 100644
--- a/src/man/Makefile.am
+++ b/src/man/Makefile.am
@@ -60,7 +60,7 @@ PO4A_TRANSLATE_OPTS = --option doctype=docbook -f docbook
# The list of files to translate
-XML_DOC=$(wildcard *.xml) $(wildcard include/*.xml)
+XML_DOC=$(wildcard $(srcdir)/*.xml) $(wildcard $(srcdir)/include/*.xml)
LANGUAGES=$(shell $(SED) 's/\#.*//' $(LINGUAS))
EXTRA_DIST += \
@@ -125,7 +125,8 @@ translate: translate-xml.stamp
done \
fi
-dist-hook: translate-xml.stamp
+distdir-hook:
+ $(MAKE) update-po
clean-local: clean-local-@USE_NLS@
distclean-local: clean-local-@USE_NLS@
--
1.7.3.2
_______________________________________________
sssd-devel mailing list
sssd-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/sssd-devel