schema/spacewalk/Makefile.schema | 8 +-------
schema/spacewalk/oracle/data/rhnVersionInfo.pre | 2 +-
schema/spacewalk/postgres/data/rhnVersionInfo.pre | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 5386d9272cb0a16167a0daaeca1cc7b74312bede
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 30 16:25:59 2010 +0200
Do not depend on cpp when sed works just as well.
diff --git a/schema/spacewalk/Makefile.schema b/schema/spacewalk/Makefile.schema
index 76cb11f..512e632 100644
--- a/schema/spacewalk/Makefile.schema
+++ b/schema/spacewalk/Makefile.schema
@@ -18,13 +18,7 @@ clean :
echo rm -f $(POST_FILES)
%.sql : %.pre
- @{ \
- cpp -D SCHEMA_NAME=\'$(SCHEMA)\' \
- -D SCHEMA_VERSION=\'$(VERSION)\' \
- -D SCHEMA_RELEASE=\'$(RELEASE)\' \
- -P -o - $< ; \
- echo ; \
- } > $@
+ sed -e "s!SCHEMA_NAME!'$(SCHEMA)'!g" -e
"s!SCHEMA_VERSION!'$(VERSION)'!g" -e
"s!SCHEMA_RELEASE!'$(RELEASE)'!" $< > $@
sanity-check :
perl schema-source-sanity-check.pl
diff --git a/schema/spacewalk/oracle/data/rhnVersionInfo.pre
b/schema/spacewalk/oracle/data/rhnVersionInfo.pre
index d9cd447..6eeca80 100644
--- a/schema/spacewalk/oracle/data/rhnVersionInfo.pre
+++ b/schema/spacewalk/oracle/data/rhnVersionInfo.pre
@@ -1,5 +1,5 @@
--
--- this populates rhnVersionInfo. It needs to be run through cpp
+-- this populates rhnVersionInfo. It needs to be run through sed
-- during build. see Makefile.schema
--
diff --git a/schema/spacewalk/postgres/data/rhnVersionInfo.pre
b/schema/spacewalk/postgres/data/rhnVersionInfo.pre
index d9cd447..6eeca80 100644
--- a/schema/spacewalk/postgres/data/rhnVersionInfo.pre
+++ b/schema/spacewalk/postgres/data/rhnVersionInfo.pre
@@ -1,5 +1,5 @@
--
--- this populates rhnVersionInfo. It needs to be run through cpp
+-- this populates rhnVersionInfo. It needs to be run through sed
-- during build. see Makefile.schema
--
Show replies by thread