diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a02ec2b660..1edf859bd6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,19 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2003-05-09 20:30 UTC-0400 David G. Holm + * Makefile + + config/doc.cf + + doc/Makefile + * doc/gmake.txt + + doc/en/Makefile + + doc/es/Makefile + + Added the ability to install files from doc directory using + the new environment variable HB_DOC_INSTALL, which is left + undefined by default. All files from doc, doc/en, and doc/es + are installed if the HB_DOC_INSTALL variable is defined when + you run 'make install'. + 2003-05-09 17:20 UTC-0400 David G. Holm * source/rtl/idle.c + Added a PRG-callable function wrapper for hb_releaseCPU() and diff --git a/harbour/Makefile b/harbour/Makefile index 62ae535c51..ad1a23e125 100644 --- a/harbour/Makefile +++ b/harbour/Makefile @@ -5,6 +5,7 @@ ROOT = ./ DIRS=\ + doc \ include \ source \ utils \ diff --git a/harbour/config/doc.cf b/harbour/config/doc.cf new file mode 100644 index 0000000000..22edf88e53 --- /dev/null +++ b/harbour/config/doc.cf @@ -0,0 +1,20 @@ +# +# $Id$ +# + +ifneq ($(HB_ARCHITECTURE),) +ifneq ($(HB_COMPILER),) +ifneq ($(HB_DOC_INSTALL),) + +include $(TOP)$(ROOT)config/global.cf + +first:: + +INSTALL_OBJS = $(DOC_FILES) +INSTALL_DIR = $(HB_DOC_INSTALL)$(DOC_SUBDIR) + +include $(TOP)$(ROOT)config/install.cf + +endif +endif +endif diff --git a/harbour/doc/Makefile b/harbour/doc/Makefile new file mode 100644 index 0000000000..82d8f6f7d7 --- /dev/null +++ b/harbour/doc/Makefile @@ -0,0 +1,46 @@ +# +# $Id$ +# + +ROOT = ../ + +DOC_FILES=\ + c_std.txt \ + class_tp.txt \ + cmdline.txt \ + codebloc.txt \ + codestyl.txt \ + dirstruc.txt \ + funclist.txt \ + genhtm.bat \ + genhtm.cmd \ + genhtm.lnk \ + genhtm.rsp \ + gmake.txt \ + gtapi.txt \ + hbmake.txt \ + hbpplib.txt \ + hdr_tpl.txt \ + howtobsd.txt \ + howtocvs.txt \ + howtomak.txt \ + hrb_faq.txt \ + lang_id.txt \ + license.txt \ + pcode.txt \ + pragma.txt \ + readme.txt \ + simplex.txt \ + statics.txt \ + tracing.txt \ + transfrm.txt \ + vm.txt \ + whatsnew.txt \ + windll.txt \ + +DIRS=\ + en \ + es \ + +include $(TOP)$(ROOT)config/doc.cf +include $(TOP)$(ROOT)config/dir.cf diff --git a/harbour/doc/en/Makefile b/harbour/doc/en/Makefile new file mode 100644 index 0000000000..9d327a87c9 --- /dev/null +++ b/harbour/doc/en/Makefile @@ -0,0 +1,74 @@ +# +# $Id$ +# + +ROOT = ../../ + +DOC_SUBDIR=/en + +DOC_FILES=\ + array.txt \ + binnum.txt \ + browse.txt \ + clipper.txt \ + cmdline.txt \ + command.txt \ + compiler.txt \ + datetime.txt \ + dbdelim.txt \ + dbsdf.txt \ + dbstrux.txt \ + dir.txt \ + diskspac.txt \ + error.txt \ + eval.txt \ + file.txt \ + garbage.txt \ + gnulice.txt \ + gtslang.txt \ + harbext.txt \ + hb_api.txt \ + hb_apier.txt \ + hb_apifs.txt \ + hb_apigt.txt \ + hb_apiit.txt \ + hb_apiln.txt \ + hb_apird.txt \ + hb_compa.txt \ + hb_date.txt \ + hb_macro.txt \ + hb_set.txt \ + hb_vm.txt \ + hvm.txt \ + idle.txt \ + input.txt \ + lang.txt \ + license.txt \ + macro.txt \ + math.txt \ + memo.txt \ + memvar2.txt \ + menu.txt \ + misc.txt \ + nation.txt \ + objfunc.txt \ + rdd.txt \ + rdddb.txt \ + rddmisc.txt \ + rddord.txt \ + readme.txt \ + sayget.txt \ + set.txt \ + setmode.txt \ + string.txt \ + strotype.txt \ + subcodes.txt \ + tbrowse.txt \ + tclass.txt \ + terminal.txt \ + tgetlist.txt \ + tlabel.txt \ + treport.txt \ + var.txt \ + +include $(TOP)$(ROOT)config/doc.cf diff --git a/harbour/doc/es/Makefile b/harbour/doc/es/Makefile new file mode 100644 index 0000000000..fb3c8a2aa3 --- /dev/null +++ b/harbour/doc/es/Makefile @@ -0,0 +1,47 @@ +# +# $Id$ +# + +ROOT = ../../ + +DOC_SUBDIR=/es + +DOC_FILES=\ + array.txt \ + binnum.txt \ + browse.txt \ + clipper.txt \ + cmdline.txt \ + codebloc.txt \ + command.txt \ + compiler.txt \ + datetime.txt \ + dbdelim.txt \ + dbsdf.txt \ + dbstrux.txt \ + dir.txt \ + dirstruc.txt \ + diskspac.txt \ + error.txt \ + eval.txt \ + garbage.txt \ + harbext.txt \ + hb_set.txt \ + hbpplib.txt \ + howtobsd.txt \ + idle.txt \ + lang.txt \ + license.txt \ + math.txt \ + memo.txt \ + pcode.txt \ + pragma.txt \ + readme.txt \ + setmode.txt \ + simplex.txt \ + statics.txt \ + strotype.txt \ + tracing.txt \ + vm.txt \ + +include $(TOP)$(ROOT)config/doc.cf diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt index 2ab3670f56..1ad7c733b1 100644 --- a/harbour/doc/gmake.txt +++ b/harbour/doc/gmake.txt @@ -243,14 +243,17 @@ For Watcom C/C++ 10.x (default Makefile creates DOS4G extender executables) SHELL=C:\COMMAND.COM C:\ E=2048 /P to your CONFIG.SYS ) -If you issue a "make install", it will try to install your header, +If you issue a "make install", it will try to install your doc, header, executable and library files into directories given by HB_BIN_INSTALL + HB_DOC_INSTALL HB_LIB_INSTALL HB_INC_INSTALL -You can set those as environment variables too. +You can set those as environment variables too. There is no default for +HB_DOC_INSTALL, so if you don't define it, then the doc files will not be +installed. The most used targets are these: