gnome-doc-utils r1126 - in trunk: . tools

[chpe svn gnome org]

Author: chpe
Date: Tue Oct 21 22:53:27 2008
New Revision: 1126
URL: http://svn.gnome.org/viewvc/gnome-doc-utils?rev=1126&view=rev

Log:
	* 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.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/tools/gnome-doc-utils.m4
   trunk/tools/gnome-doc-utils.make

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Oct 21 22:53:27 2008
@@ -16,6 +16,8 @@
 fi
 AC_SUBST(GDU_AWK)
 
+AC_PROG_LN_S
+
 gdu_cv_have_gdu=yes
 GNOME_DOC_DEFINES
 

Modified: trunk/tools/gnome-doc-utils.m4
==============================================================================
--- trunk/tools/gnome-doc-utils.m4	(original)
+++ trunk/tools/gnome-doc-utils.m4	Tue Oct 21 22:53:27 2008
@@ -36,7 +36,8 @@
 # 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],

Modified: trunk/tools/gnome-doc-utils.make
==============================================================================
--- trunk/tools/gnome-doc-utils.make	(original)
+++ trunk/tools/gnome-doc-utils.make	Tue Oct 21 22:53:27 2008
@@ -504,14 +504,13 @@
 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 @@
 	      $(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