diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-02-05 20:05:48 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-02-05 20:05:48 (GMT) |
| commit | 0c5cedfff9dbe678af849cbde09ea145534030b8 (patch) | |
| tree | fb93074e3293a175d46d7d8fcf62a0c37df27a23 | |
| parent | 4ad78c82e230e98cf10c40b22c92b86eca74bc4f (diff) | |
| download | hdf5-0c5cedfff9dbe678af849cbde09ea145534030b8.zip hdf5-0c5cedfff9dbe678af849cbde09ea145534030b8.tar.gz hdf5-0c5cedfff9dbe678af849cbde09ea145534030b8.tar.bz2 | |
[svn-r3354] Purpose:
Fix for install-doc feature
Description:
I fixed the install-doc feature so that it actually works! (Imagine
:-).
Solution:
It manually checks if the DOCDIR exists. If not, then it mkdir's it.
Then it does the install of the appropriate docs.
Platforms tested:
Linux, Solaris
| -rw-r--r-- | config/conclude.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/config/conclude.in b/config/conclude.in index 197b778..b8ef185 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -61,9 +61,6 @@ $(includedir): $(bindir): mkdir $@ && chmod 755 $@ -$(DOCDIR): - mkdir $@ && chmod 755 $@ - ## Install the library, the public header files, and public programs. install: $(PUB_LIB) $(PUB_HDR) $(PUB_PROGS) $(libdir) $(includedir) $(bindir) @for f in X $(PUB_LIB); do \ @@ -91,7 +88,12 @@ install: $(PUB_LIB) $(PUB_HDR) $(PUB_PROGS) $(libdir) $(includedir) $(bindir) done ## Install the documents. -install-doc: $(PUB_DOCS) $(DOCDIR) +install-doc: $(PUB_DOCS) + @if test -d $(DOCDIR) ; then \ + :; \ + else \ + mkdir $(DOCDIR) && chmod 755 $(DOCDIR); \ + fi @for d in X $(SUBDIRS); do \ if test $$d != X; then \ (set -x; cd $$d && $(MAKE) $@) || exit 1; \ @@ -113,7 +115,7 @@ uninstall: @for f in libhdf5.settings $(LIB); do \ $(LT_UNINSTALL) $(libdir)/$$f; \ done - @if test "X$(PUB_HDR)" != X; then \ + @if test "X$(PUB_HDR)" != "X"; then \ set -x; cd $(includedir) && $(RM) $(PUB_HDR); \ fi @for f in X $(PUB_PROGS); do \ @@ -129,7 +131,7 @@ uninstall-doc: (set -x; cd $$d && $(MAKE) $@) || exit 1; \ fi; \ done - @if test "X$(PUB_DOCS)" != X; then \ + @if test "X$(PUB_DOCS)" != "X"; then \ set -x; cd $(DOCDIR) && $(RM) $(PUB_DOCS); \ fi |