diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | tools/gnome-doc-utils.m4 | 3 | ||||
-rw-r--r-- | tools/gnome-doc-utils.make | 14 |
4 files changed, 24 insertions, 6 deletions
@@ -1,3 +1,14 @@ +2008-10-22 Christian Persch <chpe@gnome.org> + + * tools/gnome-doc-utils.make: Save disk space by Symlinking the + non-localised figures to the C figures instead of copying them. Bug + #557227. + + * tools/gnome-doc-utils.m4: Require AC_PROG_LN_S. + + * configure.ac: Call AC_PROG_LN_S explicitly since g-d-u doesn't use + GNOME_DOC_INIT itself. + 2008-09-22 Shaun McCance <shaunm@gnome.org> * configure.in: diff --git a/configure.in b/configure.in index a950edb..0d03433 100644 --- a/configure.in +++ b/configure.in @@ -16,6 +16,8 @@ else fi AC_SUBST(GDU_AWK) +AC_PROG_LN_S + gdu_cv_have_gdu=yes GNOME_DOC_DEFINES diff --git a/tools/gnome-doc-utils.m4 b/tools/gnome-doc-utils.m4 index 04f79bb..4aef712 100644 --- a/tools/gnome-doc-utils.m4 +++ b/tools/gnome-doc-utils.m4 @@ -36,7 +36,8 @@ AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) # GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) # AC_DEFUN([GNOME_DOC_INIT], -[ +[AC_REQUIRE([AC_PROG_LN_S])dnl + ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], diff --git a/tools/gnome-doc-utils.make b/tools/gnome-doc-utils.make index 147ab77..b7ea210 100644 --- a/tools/gnome-doc-utils.make +++ b/tools/gnome-doc-utils.make @@ -504,14 +504,13 @@ install-doc-docs: install-doc-figs: @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \ for lc in C $(_DOC_REAL_LINGUAS); do \ + figsymlink=false; \ if test -f "$$lc/$$fig"; then \ figfile="$$lc/$$fig"; \ elif test -f "$(srcdir)/$$lc/$$fig"; then \ figfile="$(srcdir)/$$lc/$$fig"; \ - elif test -f "C/$$fig"; then \ - figfile="C/$$fig"; \ else \ - figfile="$(srcdir)/C/$$fig"; \ + figsymlink=true; \ fi; \ figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \ @@ -520,8 +519,13 @@ install-doc-figs: $(mkinstalldirs) "$$figdir"; \ fi; \ figbase=`echo $$fig | sed -e 's/^.*\///'`; \ - echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ - $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ + if $$figsymlink; then \ + echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \ + ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \ + else \ + echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ + $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ + fi; \ done; \ done |