diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gnome-doc-utils.make | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2005-08-20 Shaun McCance <shaunm@gnome.org> + + * gnome-doc-utils.make: + - Fix up some sed expressions, from Joe Markus Clarke, #312969 + 2005-08-02 Abduxukur Abdurixit <abdurixit@gmail.com> * configure.in: Added 'ug' to ALL_LINGUAS. diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make index e079918..e26d23d 100644 --- a/gnome-doc-utils.make +++ b/gnome-doc-utils.make @@ -35,7 +35,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS); @rm -f $@.tmp; touch $@.tmp; echo 'const gchar* documentation_credits[] = {' >> $@.tmp for doc in $(DOC_H_DOCS); do \ - xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*\|.*/\1/'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*\|.*/\1/'`"; \ + xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ xsltproc --path "$$xmlpath" $(_credits) $$doc; \ done | sort | uniq \ @@ -45,7 +45,7 @@ $(DOC_H_FILE): $(DOC_H_DOCS); echo '};' >> $@.tmp echo >> $@.tmp for doc in $(DOC_H_DOCS); do \ - xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*\|.*/\1/'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*\|.*/\1/'`"; \ + xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ @@ -586,7 +586,7 @@ dist-doc-figs: $(_DOC_SRC_FIGURES) @for fig in $(_DOC_C_FIGURES) $(_DOC_LC_FIGURES); do \ if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$fig"; then \ - figdir=`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \ + figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ if ! test -d "$(distdir)/$$figdir"; then \ echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ $(mkinstalldirs) "$(distdir)/$$figdir"; \ @@ -663,7 +663,7 @@ install-doc-figs: else \ figfile="$(srcdir)/C/$$fig"; \ fi; \ - figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \ + figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \ if ! test -d "$$figdir"; then \ echo "$(mkinstalldirs) $$figdir"; \ |