ICU-1476 if Doxygen cannot be found, have make doc generate a warning,

and do not prevent installation to succeed.

X-SVN-Rev: 6765
This commit is contained in:
Yves Arrouye 2001-11-11 07:22:54 +00:00
parent a2eb2cd5b2
commit 30a1c84d02
3 changed files with 163 additions and 154 deletions

View File

@ -66,11 +66,17 @@ distclean : distclean-recursive distclean-local
dist: dist-recursive dist-local
check: all check-recursive check-local
ifeq ($(DOXYGEN),)
doc:
@echo Doxygen is required to generate documentation. Doxygen can be found on the
@echo Web at http://www.doxygen.org/
else
doc: Doxyfile
$(DOXYGEN)
Doxyfile: $(srcdir)/Doxyfile.in
CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
endif
LOCAL_SUBDIRS = $(SUBDIRS)
CLEAN_FIRST_SUBDIRS = tools
@ -110,10 +116,14 @@ install-icu: $(top_builddir)/config/Makefile.inc @platform_make_fragment@ README
$(INSTALL_DATA) @platform_make_fragment@ $(DESTDIR)$(pkgdatadir)/config/@platform_make_fragment_name@
$(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs
$(INSTALL_DATA) README $(DESTDIR)$(pkgdatadir)/README
ifeq ($(DOXYGEN),)
install-doc:
else
install-doc: doc
$(RM) -r $(DESTDIR)$(docdir)/$(docsubdir)
$(MKINSTALLDIRS) $(DESTDIR)$(docdir)/$(docsubdir)
$(INSTALL_DATA) doc/html/* $(DESTDIR)$(docdir)/$(docsubdir)
endif
$(DESTDIR)$(pkglibdir)/%: $(top_srcdir)/../data/%
$(INSTALL_DATA) $< $@

303
icu4c/source/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@ dnl Copyright (c) 1999-2000, International Business Machines Corporation and
dnl others. All Rights Reserved.
dnl Stephen F. Booth, heavily modified by Yves and others
dnl $Id: configure.in,v 1.137 2001/11/11 06:58:13 yves-oss Exp $
dnl $Id: configure.in,v 1.138 2001/11/11 07:22:54 yves-oss Exp $
dnl Process this file with autoconf to produce a configure script
AC_INIT(common/unicode/utypes.h)
@ -72,7 +72,7 @@ AC_PATH_PROGS(U_MAKE, gmake, make)
AC_SUBST(U_MAKE)
dnl Check for doxygen to generate documentation
AC_PATH_PROG(DOXYGEN,doxygen,/usr/bin/doxygen,$PATH:/usr/local/bin:/usr/bin)
AC_PATH_PROG(DOXYGEN,doxygen,,$PATH:/usr/local/bin:/usr/bin)
dnl Determine how strict we want to be when compiling
AC_CHECK_STRICT_COMPILE