diff options
| -rw-r--r-- | config/commence.in | 2 | ||||
| -rw-r--r-- | config/conclude.in | 23 | ||||
| -rw-r--r-- | doc/html/Tutor/examples/Makefile.in | 20 |
3 files changed, 40 insertions, 5 deletions
diff --git a/config/commence.in b/config/commence.in index c212a37..1b32fa9 100644 --- a/config/commence.in +++ b/config/commence.in @@ -57,12 +57,14 @@ LT_UNINSTALL=$(LT) --mode=uninstall $(RM) ## complains if it sees a reference to a variable which has never been ## defined. The main makefile is free to redefine these to something else. DOCDIR=$(docdir) +SUBDOCDIR= LIB= LIB_SRC= LIB_OBJ= PUB_HDR= PUB_PROGS= PUB_DOCS= +PUB_SUBDOCS= PROGS= TEST_PROGS= TEST_FLAGS= diff --git a/config/conclude.in b/config/conclude.in index b6d566c..a880637 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -115,14 +115,19 @@ install: $(PUB_LIB) $(PUB_HDR) $(PUB_PROGS) $(libdir) $(includedir) $(bindir) ## install-doc: $(PUB_DOCS) @if test -d $(DOCDIR) ; then \ - :; \ + :; \ else \ mkdir $(DOCDIR) && chmod 755 $(DOCDIR); \ fi + @if test -d $(SUBDOCDIR) ; then \ + :; \ + else \ + mkdir $(SUBDOCDIR) && chmod 755 $(SUBDOCDIR); \ + fi @for d in X $(SUBDIRS); do \ - if test $$d != X; then \ - (set -x; cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ + if test $$d != X; then \ + (set -x; cd $$d && $(MAKE) $@) || exit 1; \ + fi; \ done @for f in X $(PUB_DOCS); do \ if test $$f != X; then \ @@ -134,6 +139,16 @@ install-doc: $(PUB_DOCS) fi; \ fi; \ done + @for f in X $(PUB_SUBDOCS); do \ + if test $$f != X; then \ + if test -f $$f; then \ + (set -x; $(INSTALL_DATA) $$f $(SUBDOCDIR)/. || exit 1); \ + else \ + (set -x; $(INSTALL_DATA) $(srcdir)/$$f $(SUBDOCDIR)/. || \ + exit 1); \ + fi; \ + fi; \ + done ## Removes those things that `make install' (would have) installed. ## diff --git a/doc/html/Tutor/examples/Makefile.in b/doc/html/Tutor/examples/Makefile.in index 2c4463c..4dcd522 100644 --- a/doc/html/Tutor/examples/Makefile.in +++ b/doc/html/Tutor/examples/Makefile.in @@ -10,9 +10,9 @@ srcdir=@srcdir@ @COMMENCE@ # Subdirectories in build-order (not including `examples') -#SUBDIRS=java SUBDIRS= DOCDIR=$(docdir)/hdf5/Tutor/examples +SUBDOCDIR=$(docdir)/hdf5/Tutor/examples/java # Public doc files (to be installed)... PUB_DOCS=h5_compound.c h5_copy.c h5_crtatt.c h5_crtdat.c h5_crtfile.c \ @@ -20,6 +20,24 @@ PUB_DOCS=h5_compound.c h5_copy.c h5_crtatt.c h5_crtdat.c h5_crtfile.c \ h5_iterate.c h5_mount.c h5_rdwt.c h5_read.c h5_ref2objr.c \ h5_ref2objw.c h5_ref2regr.c h5_ref2regw.c h5_reference.c +PUB_SUBDOCS=java/Compound.java java/Copy.java java/CreateAttribute.java \ + java/CreateDataset.java java/CreateFile.java \ + java/CreateFileInput.java java/CreateGroup.java \ + java/CreateGroupAR.java java/CreateGroupDataset.java \ + java/DatasetRdWt.java java/HyperSlab.java java/Makefile \ + java/Makefile.in java/README java/readme.html \ + java/runCompound.sh java/runCompound.sh.in java/runCopy.sh \ + java/runCopy.sh.in java/runCreateAttribute.sh \ + java/runCreateAttribute.sh.in java/runCreateDataset.sh \ + java/runCreateDataset.sh.in java/runCreateFile.sh \ + java/runCreateFile.sh.in java/runCreateFileInput.sh \ + java/runCreateFileInput.sh.in java/runCreateGroup.sh \ + java/runCreateGroup.sh.in java/runCreateGroupAR.sh \ + java/runCreateGroupAR.sh.in java/runCreateGroupDataset.sh \ + java/runCreateGroupDataset.sh.in java/runDatasetRdWt.sh \ + java/runDatasetRdWt.sh.in java/runHyperSlab.sh \ + java/runHyperSlab.sh.in + # Other doc files (not to be installed)... PRIVATE_DOCS= |