diff options
author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-03-09 22:30:51 (GMT) |
---|---|---|
committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-03-09 22:30:51 (GMT) |
commit | ee17f3731ebc5bddb3ba14d5647b8e997566ad49 (patch) | |
tree | ccce7e614d2a9f9225aea9eb47bde0eb73f340e0 /config/conclude.in | |
parent | 622f76418eb2b10bd5fd97dad477ebee8bc0b603 (diff) | |
download | hdf5-ee17f3731ebc5bddb3ba14d5647b8e997566ad49.zip hdf5-ee17f3731ebc5bddb3ba14d5647b8e997566ad49.tar.gz hdf5-ee17f3731ebc5bddb3ba14d5647b8e997566ad49.tar.bz2 |
[svn-r3586] Purpose:
Hack
Description:
Need to install the files in the examples/java directory, however
they include installing a Makefile. This was causing havoc with our
Makefile/configure system.
Solution:
Changed so that you can specify a "SUBDOCDIR" which will create a
subdirectory for you and fill it with files specified in PUB_SUBDOCS.
Platforms tested:
Linux
Diffstat (limited to 'config/conclude.in')
-rw-r--r-- | config/conclude.in | 23 |
1 files changed, 19 insertions, 4 deletions
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. ## |