# HG changeset patch
# User Rik <octave@nomad.inbox5.com>
# Date 1281378060 25200
# Node ID 62ed71623aca973616d3b2441ddda9b46a98bfb3
# Parent  8f17e3309a8220715d0eb8e47738ccb4edf4ebee
Add documentation Makefile dependency on images.mk

diff --git a/doc/ChangeLog b/doc/ChangeLog
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-08  Rik <octave@nomad.inbox5.com>
+
+	* interpreter/Makefile.am: Add documentation dependency on images.mk.
+	* interpreter/config-images.sh: Create images.mk in passed in srcdir, 
+	rather than pwd.
+
 2010-08-08  Rik <octave@nomad.inbox5.com>
 
 	* interpreter/images.awk: HTML images depend on octave.html/index.html.
diff --git a/doc/interpreter/Makefile.am b/doc/interpreter/Makefile.am
--- a/doc/interpreter/Makefile.am
+++ b/doc/interpreter/Makefile.am
@@ -78,6 +78,9 @@
 
 include images.mk
 
+$(srcdir)/images.mk: $(srcdir)/config-images.sh $(srcdir)/images.awk $(srcdir)/images
+	$(srcdir)/config-images.sh $(top_srcdir)
+
 .eps.pdf:
 	if [ -f $< ] ; then $(GHOSTSCRIPT) -dBATCH -dEPSCrop -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=$@ $< ; fi
 
@@ -147,7 +150,7 @@
   contributors.texi \
   $(MUNGED_TEXI_SRC)
 
-octave.info octave.dvi octave.html octave.pdf: $(srcdir)/version.texi $(octave_TEXINFOS) $(EXAMPLE_FILES)
+octave.info octave.dvi octave.html octave.pdf: $(srcdir)/version.texi $(octave_TEXINFOS) $(EXAMPLE_FILES) images.mk
 
 octave.info: $(IMAGES_TXT)
 
diff --git a/doc/interpreter/config-images.sh b/doc/interpreter/config-images.sh
--- a/doc/interpreter/config-images.sh
+++ b/doc/interpreter/config-images.sh
@@ -4,5 +4,14 @@
 
 : ${AWK=awk}
 
-$AWK -f images.awk images > images.mk-t
-../../move-if-change images.mk-t images.mk
+if [ $# -eq 1 ]; then
+  top_srcdir="$1";
+else
+  top_srcdir="../.."
+fi
+
+interp_dir=$top_srcdir/doc/interpreter
+
+$AWK -f $interp_dir/images.awk < $interp_dir/images > $interp_dir/images.mk-t
+
+$top_srcdir/move-if-change $interp_dir/images.mk-t $interp_dir/images.mk