From df7f73bd454e0b0ee7870d8c85874aba9329fd2e Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Fri, 8 Feb 2008 13:06:11 +0000 Subject: [PATCH] gtk-doc/: Use '$(SED)' instead of 'sed'. Don't use -i for in-place as its gnu only, move to a temp file instead. Original commit message from CVS: * gtk-doc-plugins.mak: * gtk-doc.mak: Use '$(SED)' instead of 'sed'. Don't use -i for in-place as its gnu only, move to a temp file instead. --- ChangeLog | 7 +++++++ gtk-doc-plugins.mak | 4 +++- gtk-doc.mak | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b1bdbc..7cf52f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-02-08 Stefan Kost + + * gtk-doc-plugins.mak: + * gtk-doc.mak: + Use '$(SED)' instead of 'sed'. Don't use -i for in-place as its gnu + only, move to a temp file instead. + 2008-02-06 Stefan Kost * gtk-doc-plugins.mak: diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak index b566651..f511cd0 100644 --- a/gtk-doc-plugins.mak +++ b/gtk-doc-plugins.mak @@ -233,7 +233,9 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @if grep "warning:" html-build.log > /dev/null; then \ echo "ERROR"; grep "warning:" html-build.log; exit 1; fi @rm html-build.log - sed -i "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml + mv html/index.sgml html/index.sgml.bak + $(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml + rm -f html/index.sgml.bak rm -f html/$(DOC_MAIN_SGML_FILE) rm -rf html/xml rm -f html/version.entities diff --git a/gtk-doc.mak b/gtk-doc.mak index 7aae8ab..1c9ece1 100644 --- a/gtk-doc.mak +++ b/gtk-doc.mak @@ -130,7 +130,9 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) cp -pr xml html cp ../version.entities html cd html && gtkdoc-mkhtml $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) - sed -i "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml + mv html/index.sgml html/index.sgml.bak + $(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml + rm -f html/index.sgml.bak rm -f html/$(DOC_MAIN_SGML_FILE) rm -rf html/xml rm -f html/version.entities -- 2.7.4