Oct 26 11:54:53 2001 Owen Taylor <otaylor@redhat.com>

        * */Makefile.am: Update to install images.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index a65ea11094855fe599360c12d6bc422591dca3ba..bcde4c56410003bd93f3b5f5a455098b81b3ad84 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 26 11:54:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * */Makefile.am: Update to install images.
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/tmpl/gtktreeviewcolumn.sgml: Remove documentation for

diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index cedbd0c2049a22eafa1f7a1c2ffebe7c91fb2b7c..2ab36d5be8fda4e8a11ba52eaa412bbc583ee6ab 100644 (file)
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -145,7 +145,8 @@ sgml.stamp: sgml-build.stamp
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        @echo '*** Building HTML ***'
-       test -d $(srcdir)/html || mkdir $(srcdir)/html
+       rm -rf $(srcdir)/html 
+       mkdir $(srcdir)/html
        cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
        test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
        @echo '-- Fixing Crossreferences' 
@@ -163,8 +164,8 @@ maintainer-clean-local: clean
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-       (installfiles=`echo $(srcdir)/html/*.html`; \
-       if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+       (installfiles=`echo $(srcdir)/html/*`; \
+       if test "$$installfiles" = '$(srcdir)/html/*'; \
        then echo '-- Nothing to install' ; \
        else \
          for i in $$installfiles; do \
@@ -192,12 +193,6 @@ dist-hook: dist-check-gtkdoc dist-hook-local
        mkdir $(distdir)/html
        -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
        -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-       cp $(srcdir)/html/index.sgml $(distdir)/html
-       -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-
-       images=$(HTML_IMAGES) ;               \
-       for i in $$images ; do                \
-         cp $(srcdir)/$$i $(distdir)/html ;  \
-       done
+       -cp $(srcdir)/html/* $(distdir)/html
 
 .PHONY : dist-hook-local

diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index a6751ba0b41e221b12ee4089f5716b5ef19568e4..7598ed8e65f8e282d4675e6997e2f87af11e32b3 100644 (file)
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -121,7 +121,7 @@ tmpl.stamp: tmpl-build.stamp
 
 #### sgml ####
 
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) 
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
        @echo '*** Building SGML ***'
        cd $(srcdir) && \
        gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
@@ -134,7 +134,8 @@ sgml.stamp: sgml-build.stamp
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        @echo '*** Building HTML ***'
-       test -d $(srcdir)/html || mkdir $(srcdir)/html
+       rm -rf $(srcdir)/html 
+       mkdir $(srcdir)/html
        cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
        test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
        @echo '-- Fixing Crossreferences' 
@@ -152,8 +153,8 @@ maintainer-clean-local: clean
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-       (installfiles=`echo $(srcdir)/html/*.html`; \
-       if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+       (installfiles=`echo $(srcdir)/html/*`; \
+       if test "$$installfiles" = '$(srcdir)/html/*'; \
        then echo '-- Nothing to install' ; \
        else \
          for i in $$installfiles; do \
@@ -181,12 +182,6 @@ dist-hook: dist-check-gtkdoc dist-hook-local
        mkdir $(distdir)/html
        -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
        -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-       cp $(srcdir)/html/index.sgml $(distdir)/html
-       -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-
-       images=$(HTML_IMAGES) ;               \
-       for i in $$images ; do                \
-         cp $(srcdir)/$$i $(distdir)/html ;  \
-       done
+       -cp $(srcdir)/html/* $(distdir)/html
 
 .PHONY : dist-hook-local

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index fcdadb5c88ec127df07161da9fa2fa52ab0229b0..373251ad65d3dfc14f341b9ced143484ac6d8eef 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -232,12 +232,10 @@ sgml.stamp: sgml-build.stamp
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        @echo '*** Building HTML ***'
-       test -d $(srcdir)/html || mkdir $(srcdir)/html
+       rm -rf $(srcdir)/html 
+       mkdir $(srcdir)/html
        cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-       images="$(HTML_IMAGES)" ;               \
-       for i in $$images ; do                  \
-         cp $$i html ;                         \
-       done
+       test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
        @echo '-- Fixing Crossreferences' 
        cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
        touch html-build.stamp
@@ -253,8 +251,8 @@ maintainer-clean-local: clean
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-       (installfiles=`echo $(srcdir)/html/*.html`; \
-       if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+       (installfiles=`echo $(srcdir)/html/*`; \
+       if test "$$installfiles" = '$(srcdir)/html/*'; \
        then echo '-- Nothing to install' ; \
        else \
          for i in $$installfiles; do \
@@ -282,12 +280,6 @@ dist-hook: dist-check-gtkdoc dist-hook-local
        mkdir $(distdir)/html
        -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
        -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-       cp $(srcdir)/html/index.sgml $(distdir)/html
-       -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-
-       images="$(HTML_IMAGES)" ;             \
-       for i in $$images ; do                \
-         cp $(srcdir)/$$i $(distdir)/html ;  \
-       done
+       -cp $(srcdir)/html/* $(distdir)/html
 
 .PHONY : dist-hook-local