...as they routinely occur in the output of 'git describe'.
To stay with the simple sed-based approach, we accept to
lose the symbol that will also cause trouble in our Haskell file,
the double quote. It is quite rare in the output of git-describe
and we just substitute it away.

Signed-off-by: Klaus Aehlig <[email protected]>
---
 Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index de3b4f1..17620bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2211,7 +2211,7 @@ epydoc.conf: epydoc.conf.in $(REPLACE_VARS_SED)
 
 vcs-version:
        if test -d .git; then \
-         git describe > $@; \
+         git describe | tr '"' - > $@; \
        elif test ! -f $@ ; then \
          echo "Cannot auto-generate $@ file"; exit 1; \
        fi
@@ -2236,7 +2236,7 @@ src/Ganeti/Version.hs: src/Ganeti/Version.hs.in \
        vcs-version $(built_base_sources)
        set -e; \
        VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
-       sed -e "s/%ver%/$$VCSVER/" < $< > $@
+       sed -e 's"%ver%"'"$$VCSVER"'"' < $< > $@
 
 src/Ganeti/Hs2Py/ListConstants.hs: src/Ganeti/Hs2Py/ListConstants.hs.in \
                                   src/Ganeti/Constants.hs \
-- 
2.2.0.rc0.207.ga3a616c

Reply via email to