rhel: Fix use of $< in ordinary Make rules.

POSIX only allows $< in inference rules, so avoid it for these target
rules.

Also, add a header to the generated spec files to remind developers that
they are generated.

diff --git a/Makefile.am b/Makefile.am
index 5e449d6d3adc71ce1b0084ebbdfd94eb7ff58fe9..91218e14ace0b7cc97babb88452159d65c56d66a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,6 +82,7 @@ EXTRA_DIST += \
        soexpand.pl
 
 ro_c = echo '/* -*- mode: c; buffer-read-only: t -*- */'
+ro_shell = printf '\043 Generated automatically -- do not modify!    -*- buffer-read-only: t -*-\n'
 
 SUFFIXES += .in
 .in:

diff --git a/rhel/automake.mk b/rhel/automake.mk
index d4d59613ecf31e19082ba6c824b8c02fb5fda7a1..34abe5b9db3df12ab2e5d81ed6aa23fc680313d2 100644 (file)
--- a/rhel/automake.mk
+++ b/rhel/automake.mk
@@ -20,11 +20,13 @@ EXTRA_DIST += \
 
 
 $(srcdir)/rhel/openvswitch-kmod-rhel5.spec: rhel/openvswitch-kmod-rhel5.spec.in $(top_builddir)/config.status
-       sed -e 's,[@]VERSION[@],$(VERSION),g' < $< > $@
+       ($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
+               < $(srcdir)/rhel/openvswitch-kmod-rhel5.spec.in > $@
 
 $(srcdir)/rhel/openvswitch-kmod-rhel6.spec: rhel/openvswitch-kmod-rhel6.spec.in $(top_builddir)/config.status
-
-       sed -e 's,[@]VERSION[@],$(VERSION),g' < $< > $@
+       ($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
+               < $(srcdir)/rhel/openvswitch-kmod-rhel6.spec.in > $@
 
 $(srcdir)/rhel/openvswitch.spec: rhel/openvswitch.spec.in $(top_builddir)/config.status
-       sed -e 's,[@]VERSION[@],$(VERSION),g' < $< > $@
+       ($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
+               < $(srcdir)/rhel/openvswitch.spec.in > $@