X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rhel%2Fautomake.mk;h=2911e719e222e64484d033b0f64526e67df1810d;hb=f2c9a37733fa3d7a00a33bc78f88c7cece2bca68;hp=d4d59613ecf31e19082ba6c824b8c02fb5fda7a1;hpb=c434706a374bd44d1274e7bdbee40067a6620b61;p=sliver-openvswitch.git

diff --git a/rhel/automake.mk b/rhel/automake.mk
index d4d59613e..2911e719e 100644
--- a/rhel/automake.mk
+++ b/rhel/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -6,25 +6,37 @@
 # without warranty of any kind.
 
 EXTRA_DIST += \
+	rhel/README.RHEL \
 	rhel/automake.mk \
 	rhel/etc_init.d_openvswitch \
 	rhel/etc_logrotate.d_openvswitch \
-	rhel/kmodtool-openvswitch-el5.sh \
-	rhel/openvswitch-kmod-rhel5.spec \
-	rhel/openvswitch-kmod-rhel5.spec.in \
+	rhel/etc_sysconfig_network-scripts_ifdown-ovs \
+	rhel/etc_sysconfig_network-scripts_ifup-ovs \
 	rhel/openvswitch-kmod-rhel6.spec \
 	rhel/openvswitch-kmod-rhel6.spec.in \
+	rhel/openvswitch-kmod.files \
+	rhel/openvswitch-kmod-fedora.spec \
+	rhel/openvswitch-kmod-fedora.spec.in \
 	rhel/openvswitch.spec \
 	rhel/openvswitch.spec.in \
-	rhel/usr_share_openvswitch_scripts_sysconfig.template
+	rhel/openvswitch-fedora.spec \
+	rhel/openvswitch-fedora.spec.in \
+	rhel/usr_share_openvswitch_scripts_sysconfig.template \
+	rhel/usr_lib_systemd_system_openvswitch.service
 
-
-$(srcdir)/rhel/openvswitch-kmod-rhel5.spec: rhel/openvswitch-kmod-rhel5.spec.in $(top_builddir)/config.status
-	sed -e 's,[@]VERSION[@],$(VERSION),g' < $< > $@
+update_rhel_spec = \
+  ($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
+    < $(srcdir)/rhel/$(@F).in > $(@F).tmp || exit 1; \
+  if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi
 
 $(srcdir)/rhel/openvswitch-kmod-rhel6.spec: rhel/openvswitch-kmod-rhel6.spec.in $(top_builddir)/config.status
+	$(update_rhel_spec)
 
-	sed -e 's,[@]VERSION[@],$(VERSION),g' < $< > $@
+$(srcdir)/rhel/openvswitch-kmod-fedora.spec: rhel/openvswitch-kmod-fedora.spec.in $(top_builddir)/config.status
+	$(update_rhel_spec)
 
 $(srcdir)/rhel/openvswitch.spec: rhel/openvswitch.spec.in $(top_builddir)/config.status
-	sed -e 's,[@]VERSION[@],$(VERSION),g' < $< > $@
+	$(update_rhel_spec)
+
+$(srcdir)/rhel/openvswitch-fedora.spec: rhel/openvswitch-fedora.spec.in $(top_builddir)/config.status
+	$(update_rhel_spec)