[systemd] define ./configure options common to build2 and build3 only once

Michal Schmidt michich at fedoraproject.org
Tue Sep 9 19:04:34 UTC 2014


commit c8f466444bdbf0d2e016926df21acfa78c345e8c
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Sep 9 20:34:46 2014 +0200

    define ./configure options common to build2 and build3 only once

 systemd.spec |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index e458eff..789190e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -279,27 +279,28 @@ rm -rf build2 build3
 mkdir build2
 mkdir build3
 
+CONFIGURE_OPTS=(
+        --libexecdir=%{_prefix}/lib
+        --with-sysvinit-path=/etc/rc.d/init.d
+        --with-rc-local-script-path-start=/etc/rc.d/rc.local
+        --disable-kdbus
+)
+
 pushd build3
 %define _configure ../configure
 %configure \
-        --libexecdir=%{_prefix}/lib \
+        "${CONFIGURE_OPTS[@]}" \
         --disable-manpages \
-        --with-sysvinit-path=/etc/rc.d/init.d \
-        --with-rc-local-script-path-start=/etc/rc.d/rc.local \
         --disable-compat-libs \
-        --disable-kdbus \
         PYTHON=%{__python3}
 make %{?_smp_mflags} GCC_COLORS="" V=1
 popd
 
 pushd build2
 %configure \
-        --libexecdir=%{_prefix}/lib \
+        "${CONFIGURE_OPTS[@]}" \
         --enable-gtk-doc \
-        --with-sysvinit-path=/etc/rc.d/init.d \
-        --with-rc-local-script-path-start=/etc/rc.d/rc.local \
-        --enable-compat-libs \
-        --disable-kdbus
+        --enable-compat-libs
 make %{?_smp_mflags} GCC_COLORS="" V=1
 popd
 


More information about the scm-commits mailing list