From 537d805a9a7a3fd14ace7cb74bb45de700922bb7 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Fri, 7 Sep 2012 07:43:11 -0400
Subject: Fix parallel make failure

The "mv" resulted in a race condition. To avoid it, before running gdbus
codegen, switch to the directory where we want its output files to go.
---
 Makefile.am | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5902180..b40710e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,10 +55,10 @@ do_subst = sed -e 's,[@]libexecdir[@],$(libexecdir),g' \
 	$(NULL)
 
 data/init.d/openrc-settingsd : data/init.d/openrc-settingsd.in
-	$(do_subst) < $(srcdir)/data/init.d/openrc-settingsd.in > $(top_srcdir)/data/init.d/openrc-settingsd
+	$(do_subst) < $(srcdir)/data/init.d/openrc-settingsd.in > $(srcdir)/data/init.d/openrc-settingsd
 
 %.service : %.service.in
-	$(do_subst) < $(srcdir)/$< > $(top_srcdir)/$@
+	$(do_subst) < $(srcdir)/$< > $(srcdir)/$@
 
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
@@ -120,28 +120,31 @@ nodist_openrc_settingsd_SOURCES = \
 	$(NULL)
 
 $(hostnamed_built_sources) : data/org.freedesktop.hostname1.xml
-	( $(GDBUS_CODEGEN) \
+	( pushd "$(srcdir)/src" > /dev/null; \
+	$(GDBUS_CODEGEN) \
 	--interface-prefix org.freedesktop. \
 	--c-namespace OpenrcSettingsdHostnamed \
 	--generate-c-code hostname1-generated \
-	$(srcdir)/data/org.freedesktop.hostname1.xml; \
-	mv hostname1-generated.{c,h} $(top_srcdir)/src/ )
+	$(abs_srcdir)/data/org.freedesktop.hostname1.xml; \
+	popd > /dev/null )
 
 $(localed_built_sources) : data/org.freedesktop.locale1.xml
-	( $(GDBUS_CODEGEN) \
+	( pushd "$(srcdir)/src" > /dev/null; \
+	$(GDBUS_CODEGEN) \
 	--interface-prefix org.freedesktop. \
 	--c-namespace OpenrcSettingsdLocaled \
 	--generate-c-code locale1-generated \
-	$(srcdir)/data/org.freedesktop.locale1.xml; \
-	mv locale1-generated.{c,h} $(top_srcdir)/src/ )
+	$(abs_srcdir)/data/org.freedesktop.locale1.xml; \
+	popd > /dev/null )
 
 $(timedated_built_sources) : data/org.freedesktop.timedate1.xml
-	( $(GDBUS_CODEGEN) \
+	( pushd "$(srcdir)/src" > /dev/null; \
+	$(GDBUS_CODEGEN) \
 	--interface-prefix org.freedesktop. \
 	--c-namespace OpenrcSettingsdTimedated \
 	--generate-c-code timedate1-generated \
-	$(srcdir)/data/org.freedesktop.timedate1.xml; \
-	mv timedate1-generated.{c,h} $(top_srcdir)/src/ )
+	$(abs_srcdir)/data/org.freedesktop.timedate1.xml; \
+	popd > /dev/null )
 
 BUILT_SOURCES = \
 	$(hostnamed_built_sources) \
-- 
cgit v1.2.3-65-gdbad