[svn-r3359] Purpose:

    Fix
Description:
    Fixed the install-doc command...
Solution:
    Mostly just fixed in the config/conclude.in file, but updated the doc
    directories with Makefile.ins and Dependencies so that they'd work.
Platforms tested:
    Linux, Solaris

12 files changed, 188 insertions, 40 deletions

diff --git a/doc/html/ADGuide/Dependencies b/doc/html/ADGuide/Dependencies
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/doc/html/ADGuide/Dependencies
diff --git a/doc/html/ADGuide/Makefile.in b/doc/html/ADGuide/Makefile.in
new file mode 100644
index 0000000..3392543
--- /dev/null
+++ b/doc/html/ADGuide/Makefile.in
@@ -0,0 +1,27 @@
+# HDF5 Library Makefile(.in)
+#
+# Copyright (C) 2001 National Center for Supercomputing Applications.
+#                    All rights reserved.
+#
+# 
+top_srcdir=@top_srcdir@
+top_builddir=../../..
+srcdir=@srcdir@
+VPATH=.:@srcdir@
+@COMMENCE@
+
+# Subdirectories in build-order (not including `examples')
+SUBDIRS=
+DOCDIR=$(docdir)/hdf5/ADGuide
+
+# Temporary files
+MOSTLYCLEAN=
+
+# Public doc files (to be installed)...
+PUB_DOCS=Changes.html H4toH5Mapping.pdf HISTORY.txt ImageSpec.html  \
+         PaletteExample1.gif Palettes.fm.anc.gif RELEASE.txt
+
+# Other doc files (not to be installed)...
+PRIVATE_DOCS=
+
+@CONCLUDE@
diff --git a/doc/html/Graphics/Dependencies b/doc/html/Graphics/Dependencies
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/doc/html/Graphics/Dependencies
diff --git a/doc/html/Graphics/Makefile.in b/doc/html/Graphics/Makefile.in
new file mode 100644
index 0000000..7521d01
--- /dev/null
+++ b/doc/html/Graphics/Makefile.in
@@ -0,0 +1,28 @@
+# HDF5 Library Makefile(.in)
+#
+# Copyright (C) 2001 National Center for Supercomputing Applications.
+#                    All rights reserved.
+#
+# 
+top_srcdir=@top_srcdir@
+top_builddir=../../..
+srcdir=@srcdir@
+VPATH=.:@srcdir@
+@COMMENCE@
+
+# Subdirectories in build-order (not including `examples')
+SUBDIRS=
+DOCDIR=$(docdir)/hdf5/Graphics
+
+TRACE=perl $(top_srcdir)/bin/trace
+
+# Temporary files
+MOSTLYCLEAN=
+
+# Public doc files (to be installed)...
+PUB_DOCS=C++.gif FORTRAN.gif Java.gif OtherAPIs.gif
+
+# Other doc files (not to be installed)...
+PRIVATE_DOCS=
+
+@CONCLUDE@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 5b4974d..1f4d7be 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -1,6 +1,7 @@
 # HDF5 Library Makefile(.in)
 #
-# Copyright (C) 1997 National Center for Supercomputing Applications.
+# Copyright (C) 1997,2001
+#                    National Center for Supercomputing Applications.
 #                    All rights reserved.
 #
 # 
@@ -11,45 +12,37 @@ VPATH=.:@srcdir@
 @COMMENCE@
 
 # Subdirectories in build-order (not including `examples')
-SUBDIRS=Tutor
+SUBDIRS=ADGuide Graphics PSandPDF TechNotes Tutor cpplus fortran
 DOCDIR=$(docdir)/hdf5
 
-TRACE=perl $(top_srcdir)/bin/trace
-
-# Add `-I.' to the C preprocessor flags.
-CPPFLAGS=-I. -I@srcdir@ @CPPFLAGS@
-
-# Temporary files
-MOSTLYCLEAN=
-
 # Public doc files (to be installed)...
-PUB_DOCS= Attributes.html Big.html Caching.html Chunking.html Chunk_f1.gif \
-	Chunk_f2.gif Chunk_f3.gif Chunk_f4.gif Chunk_f5.gif Chunk_f6.gif \
-	Coding.html Copyright.html Datasets.html Dataspaces.html \
-	Datatypes.html ddl.html Debugging.html EnumMap.gif Environment.html \
-	Errors.html FF-IH_FileGroup.gif FF-IH_FileObject.gif Files.html \
-	Filters.html FF-IH_FileGroup.gif FF-IH_FileObject.gif Glossary.html \
-	Groups.html H5.api_map.html H5.format.html H5.intro.html \
-	H5.sample_code.html H5.user.html H5.user.PrintGen.html \
-	H5.user.PrintTpg.html IH_map1.gif IH_map2.gif IH_map3.gif IH_map4.gif \
-	IH_mapFoot.gif IH_mapHead.gif IOPipe.html MountingFiles.html \
-	NCSAfooterlogo.gif PaletteExample1.gif Palettes.fm.anc.gif \
-	Palettes.html Performance.html Properties.html Ragged.html \
-	References.html RM_H5.html \
-	RM_H5A.html RM_H5D.html RM_H5E.html RM_H5F.html RM_H5Front.html \
-	RM_H5G.html RM_H5I.html RM_H5P.html RM_H5R.html RM_H5RA.html \
-	RM_H5S.html RM_H5T.html RM_H5Z.html Tools.html Version.html chunk1.gif \
-	compat.html dataset_p1.gif dataset_p1.obj extern1.gif extern2.gif \
-	group_p1.gif group_p2.gif group_p3.gif h5s.examples hdf2.jpg \
-	ph5design.html ph5example.c ph5implement.txt pipe1.gif pipe2.gif \
-	pipe3.gif pipe4.gif pipe5.gif index.html version.gif
+PUB_DOCS=ADGuide.html Attributes.html Big.html Caching.html Chunk_f1.gif  \
+         Chunk_f2.gif Chunk_f3.gif Chunk_f4.gif Chunk_f5.gif Chunk_f6.gif \
+         Chunking.html Coding.html Copyright.html Datasets.html           \
+         Dataspaces.html Datatypes.html DatatypesEnum.html Debugging.html \
+         EnumMap.gif Environment.html Errors.html FF-IH_FileGroup.gif     \
+         FF-IH_FileObject.gif Files.html Filters.html Glossary.html       \
+         Groups.html H5.api_map.html H5.format.html H5.intro.html         \
+         H5.sample_code.html H5.user.PrintGen.html H5.user.PrintTpg.html  \
+         H5.user.html IH_map1.gif IH_map2.gif IH_map3.gif IH_map4.gif     \
+         IH_mapFoot.gif IH_mapHead.gif IOPipe.html MountingFiles.html     \
+         NCSAfooterlogo.gif Performance.html PredefDTypes.html            \
+         Properties.html RM_H5.html RM_H5A.html RM_H5D.html RM_H5E.html   \
+         RM_H5F.html RM_H5Front.html RM_H5G.html RM_H5I.html RM_H5P.html  \
+         RM_H5R.html RM_H5S.html RM_H5T.html RM_H5Z.html References.html  \
+         TechNotes.html Tools.html Version.html chunk1.gif compat.html    \
+         dataset_p1.gif dataset_p1.obj ddl.html extern1.gif extern2.gif   \
+         group_p1.gif group_p2.gif group_p3.gif h5s.examples hdf2.jpg     \
+         ph5design.html ph5example.c ph5implement.txt pipe1.gif pipe2.gif \
+         pipe3.gif pipe4.gif pipe5.gif index.html version.gif
 
 # Other doc files (not to be installed)...
-PRIVATE_DOCS= Chunk_f1.obj Chunk_f2.obj Chunk_f6.obj CodeReview.html \
-	ExternalFiles.html MemoryManagement.html ObjectHeader.txt chunk1.obj \
-	extern1.obj extern2.obj group_p1.obj group_p2.obj group_p3.obj \
-	pipe1.obj pipe2.obj pipe3.obj pipe4.obj pipe5.obj heap.txt move.html \
-	review1.html review1a.html storage.html symtab version.obj \
-	Lib_Maint.html
+PRIVATE_DOCS=Chunk_f1.obj Chunk_f2.obj Chunk_f6.obj CodeReview.html      \
+             ExternalFiles.html Lib_Maint.html MemoryManagement.html     \
+             ObjectHeader.txt chunk1.obj dataset_p1.obj extern1.obj      \
+             extern2.obj group_p1.obj group_p2.obj group_p3.obj heap.txt \
+             move.html pipe1.obj pipe2.obj pipe3.obj pipe4.obj           \
+             pipe5.obj review1.html review1a.html storage.html symtab    \
+             version.obj
 
 @CONCLUDE@
diff --git a/doc/html/PSandPDF/Dependencies b/doc/html/PSandPDF/Dependencies
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/doc/html/PSandPDF/Dependencies
diff --git a/doc/html/PSandPDF/Makefile.in b/doc/html/PSandPDF/Makefile.in
new file mode 100644
index 0000000..cf369cb
--- /dev/null
+++ b/doc/html/PSandPDF/Makefile.in
@@ -0,0 +1,28 @@
+# HDF5 Library Makefile(.in)
+#
+# Copyright (C) 2001 National Center for Supercomputing Applications.
+#                    All rights reserved.
+#
+# 
+top_srcdir=@top_srcdir@
+top_builddir=../../..
+srcdir=@srcdir@
+VPATH=.:@srcdir@
+@COMMENCE@
+
+# Subdirectories in build-order (not including `examples')
+SUBDIRS=
+DOCDIR=$(docdir)/hdf5/PSandPDF
+
+TRACE=perl $(top_srcdir)/bin/trace
+
+# Temporary files
+MOSTLYCLEAN=
+
+# Public doc files (to be installed)...
+PUB_DOCS=
+
+# Other doc files (not to be installed)...
+PRIVATE_DOCS=
+
+@CONCLUDE@
diff --git a/doc/html/TechNotes/Dependencies b/doc/html/TechNotes/Dependencies
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/doc/html/TechNotes/Dependencies
diff --git a/doc/html/TechNotes/Makefile.in b/doc/html/TechNotes/Makefile.in
new file mode 100644
index 0000000..1614312
--- /dev/null
+++ b/doc/html/TechNotes/Makefile.in
@@ -0,0 +1,36 @@
+# HDF5 Library Makefile(.in)
+#
+# Copyright (C) 2001 National Center for Supercomputing Applications.
+#                    All rights reserved.
+#
+# 
+top_srcdir=@top_srcdir@
+top_builddir=../../..
+srcdir=@srcdir@
+VPATH=.:@srcdir@
+@COMMENCE@
+
+# Subdirectories in build-order (not including `examples')
+SUBDIRS=
+DOCDIR=$(docdir)/hdf5/TechNotes
+
+TRACE=perl $(top_srcdir)/bin/trace
+
+# Temporary files
+MOSTLYCLEAN=
+
+# Public doc files (to be installed)...
+PUB_DOCS=BigDataSmMach.html ChStudy_1000x1000.gif ChStudy_250x250.gif      \
+         ChStudy_499x499.gif ChStudy_5000x1000.gif ChStudy_500x500.gif     \
+         ChStudy_p1.gif ChunkingStudy.html CodeReview.html                 \
+         ExternalFiles.html FreeLists.html H4-H5Compat.html HeapMgmt.html  \
+         IOPipe.html LibMaint.html MemoryMgmt.html MoveDStruct.html        \
+         NamingScheme.html ObjectHeader.html RawDStorage.html              \
+         SWControls.html SymbolTables.html ThreadSafeLibrary.html VFL.html \
+         VFLfunc.html Version.html openmp-hdf5.c openmp-hdf5.html          \
+         pipe1.gif pipe2.gif pipe3.gif pipe4.gif pipe5.gif version.gif
+
+# Other doc files (not to be installed)...
+PRIVATE_DOCS=ChStudy_p1.obj pipe1.obj pipe2.obj pipe3.obj pipe4.obj pipe5.obj
+
+@CONCLUDE@
diff --git a/doc/html/Tutor/Graphics/Dependencies b/doc/html/Tutor/Graphics/Dependencies
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/doc/html/Tutor/Graphics/Dependencies
diff --git a/doc/html/Tutor/Graphics/Makefile.in b/doc/html/Tutor/Graphics/Makefile.in
new file mode 100644
index 0000000..90aa208
--- /dev/null
+++ b/doc/html/Tutor/Graphics/Makefile.in
@@ -0,0 +1,29 @@
+# HDF5 Library Makefile(.in)
+#
+# Copyright (C) 2001 National Center for Supercomputing Applications.
+#                    All rights reserved.
+#
+# 
+top_srcdir=@top_srcdir@
+top_builddir=../../../..
+srcdir=@srcdir@
+@COMMENCE@
+
+# Subdirectories in build-order (not including `examples')
+SUBDIRS=
+DOCDIR=$(docdir)/hdf5/Tutor/Graphics
+
+# Public doc files (to be installed)...
+PUB_DOCS=AddInfo.gif AdvTopics.gif BLANK.gif ChunkExt.gif CompDTypes.gif  \
+         Copy.gif CreateAttr.gif CreateDset1.gif CreateDset2.gif          \
+         CreateFile.gif CreateGrp1.gif CreateGrp2.gif Examples.gif        \
+         FileOrg.gif FullTOC1.gif FullTOC2.gif Glossary.gif H5API.gif     \
+         Intro.gif IntroTopics.gif Iterate.gif MountFile.gif Quiz.gif     \
+         QuizAns.gif RdWrDataset.gif RefObject.gif RefRegion.gif          \
+         References.gif SelectElemCp.gif SelectHyp.gif TOC.gif            \
+         TOCFull.gif TOCShort.gif TitlePg.gif Utilities.gif
+
+# Other doc files (not to be installed)...
+PRIVATE_DOCS=
+
+@CONCLUDE@
diff --git a/doc/html/Tutor/Makefile.in b/doc/html/Tutor/Makefile.in
index c5c9601..da54607 100644
--- a/doc/html/Tutor/Makefile.in
+++ b/doc/html/Tutor/Makefile.in
@@ -1,6 +1,6 @@
 # HDF5 Library Makefile(.in)
 #
-# Copyright (C) 1997 National Center for Supercomputing Applications.
+# Copyright (C) 2001 National Center for Supercomputing Applications.
 #                    All rights reserved.
 #
 # 
@@ -9,12 +9,19 @@ top_builddir=../../..
 srcdir=@srcdir@
 @COMMENCE@
 
-# Subdirectories in build-order (not including `examples')
-SUBDIRS=
+# Subdirectories in build-order
+SUBDIRS=Graphics examples
 DOCDIR=$(docdir)/hdf5/Tutor
 
 # Public doc files (to be installed)...
-PUB_DOCS=
+PUB_DOCS=Contents.html ContentsAdd.html ContentsAdv.html                   \
+         ContentsFull.html ContentsIntro.html Copyright.html answers.html  \
+         api.html bighdf2sp.JPG compound.html crtatt.html crtdat.html      \
+         crtfile.html crtgrp.html crtgrpar.html crtgrpd.html extend.html   \
+         fileorg.html glossary.html img001.gif img002.gif img003.gif       \
+         img004.gif img005.gif index.html intro.html iterate.html          \
+         mount.html questions.html rdwt.html references.html reftoobj.html \
+         reftoreg.html select.html selectc.html title.html util.html
 
 # Other doc files (not to be installed)...
 PRIVATE_DOCS=