wip: Fix "make distcheck".

russellb · Mar 7, 2016 · b21f26d · b21f26d
1 parent 79b4e6d
commit b21f26d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.travis/build.sh b/.travis/build.sh
@@ -90,12 +90,12 @@ if [ "$KERNEL" ] && [ ! "$TESTSUITE" ] && [ ! "$DPDK" ]; then
 fi
 
 if [ "$CC" = "clang" ]; then
-    make CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument"
+    make -j3 CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument"
 elif [[ $BUILD_ENV =~ "-m32" ]]; then
     # Disable sparse for 32bit builds on 64bit machine
-    make CFLAGS="$CFLAGS $BUILD_ENV"
+    make -j3 CFLAGS="$CFLAGS $BUILD_ENV"
 else
-    make CFLAGS="$CFLAGS $BUILD_ENV $SPARSE_FLAGS" C=1
+    make -j3 CFLAGS="$CFLAGS $BUILD_ENV $SPARSE_FLAGS" C=1
 fi
 
 if [ "$TESTSUITE" ] && [ "$CC" != "clang" ]; then

diff --git a/rhel/automake.mk b/rhel/automake.mk
@@ -33,9 +33,10 @@ EXTRA_DIST += \
 	rhel/usr_lib_systemd_system_ovn-northd.service
 
 update_rhel_spec = \
-  $(AM_V_GEN)($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
+  $(AM_V_GEN)($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g' \
+                                 -e 's,[@]RUNDIR[@],$(RUNDIR),g') \
     < $(srcdir)/rhel/$(@F).in > $(@F).tmp || exit 1; \
-  if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi
+  if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else if -f $@ ; then echo "EXISTING" && cat $@ ; fi ; echo "NEW / TMP" && cat $(@F).tmp ; mv $(@F).tmp $@; fi
 
 $(srcdir)/rhel/openvswitch-dkms.spec: rhel/openvswitch-dkms.spec.in $(top_builddir)/config.status
 	$(update_rhel_spec)
@@ -53,6 +54,7 @@ $(srcdir)/rhel/openvswitch-fedora.spec: rhel/openvswitch-fedora.spec.in $(top_bu
 	$(update_rhel_spec)
 
 $(srcdir)/rhel/usr_lib_systemd_system_ovn-controller.service: rhel/usr_lib_systemd_system_ovn-controller.service.in $(top_builddir)/config.status
+	$(update_rhel_spec)
 
 RPMBUILD_TOP := $(abs_top_builddir)/rpm/rpmbuild