summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2011-06-17 10:58:01 +0200
committerRob Crittenden <rcritten@redhat.com>2011-06-19 20:28:51 -0400
commitf2df2a6954e55348f8224be19bf727965e3e75f0 (patch)
tree579e1188d85516693f407c9c99568d28556470b1
parentd9808498a82fa8662e5bc1bc1fca4d175fe9447c (diff)
downloadfreeipa-f2df2a6954e55348f8224be19bf727965e3e75f0.tar.gz
freeipa-f2df2a6954e55348f8224be19bf727965e3e75f0.tar.xz
freeipa-f2df2a6954e55348f8224be19bf727965e3e75f0.zip
Multi-process build problems
Fix a problem when a target missed a version-update requirement. This caused build problems, especially in a parallel build environment. https://fedorahosted.org/freeipa/ticket/1215
-rw-r--r--Makefile2
-rw-r--r--freeipa.spec.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3e21ef43b..6484dbbc9 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ version-update: release-update
./makeapi --validate; \
fi
-server:
+server: version-update
python setup.py build
server-install: server
diff --git a/freeipa.spec.in b/freeipa.spec.in
index cc674e1ad..c49ca2b56 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -218,12 +218,12 @@ cd install; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localst
%endif
%if ! %{ONLY_CLIENT}
-make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} version-update all
+make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} all
cd selinux
# This isn't multi-process make capable yet
make all
%else
-make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} version-update client
+make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} client
%endif
%install