From 2b7d040e28989c0c81b57312938ced8c8ddf6adb Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Tue, 3 Feb 2009 13:15:40 +0000 Subject: [PATCH] 2009-02-03 14:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/doc/Makefile * harbour/doc/es/Makefile * updated file list * harbour/debian/rules ! changed to use documentation files installed by harbour install phase Please test. --- harbour/ChangeLog | 9 +++++++++ harbour/debian/rules | 6 ++---- harbour/doc/Makefile | 13 ++++++++----- harbour/doc/es/Makefile | 21 +++++++++++++++++++++ 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c441b42a8e..43a15468ed 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,15 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-03 14:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/doc/Makefile + * harbour/doc/es/Makefile + * updated file list + + * harbour/debian/rules + ! changed to use documentation files installed by harbour install phase + Please test. + 2009-02-03 12:58 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/make_gcc.sh + added some Solaris libraries necessary to link Harbour applications diff --git a/harbour/debian/rules b/harbour/debian/rules index da23d0aa44..2cbbd35f25 100755 --- a/harbour/debian/rules +++ b/harbour/debian/rules @@ -9,12 +9,13 @@ export _DEFAULT_BIN_DIR=/usr/bin export _DEFAULT_INC_DIR=/usr/include/harbour export _DEFAULT_LIB_DIR=/usr/lib/harbour +export _DEFAULT_DOC_DIR=/usr/share/doc/harbour export INSTDIR=$(CURDIR)/debian/harbour export HB_BIN_INSTALL=$(INSTDIR)$(_DEFAULT_BIN_DIR) export HB_LIB_INSTALL=$(INSTDIR)$(_DEFAULT_LIB_DIR) export HB_INC_INSTALL=$(INSTDIR)$(_DEFAULT_INC_DIR) +export HB_DOC_INSTALL=$(INSTDIR)$(_DEFAULT_DOC_DIR) export HB_ETC_DIR=$(INSTDIR)/etc -export HB_DOC_INSTALL=$(INSTDIR)/usr/share/doc CFLAGS = -g @@ -55,9 +56,6 @@ install: build rm -f $(HB_BIN_INSTALL)/hbverfix install -m644 debian/harbour.cfg $(HB_ETC_DIR)/harbour.cfg install -m644 source/rtl/gtcrs/hb-charmap.def $(HB_ETC_DIR)/harbour - install -m644 doc/*.txt $(HB_DOC_INSTALL)/harbour - install -m644 doc/en/*.txt $(HB_DOC_INSTALL)/harbour/en - install -m644 doc/es/*.txt $(HB_DOC_INSTALL)/harbour/es # Build architecture-independent files here. diff --git a/harbour/doc/Makefile b/harbour/doc/Makefile index 6ad6cad994..47f499e989 100644 --- a/harbour/doc/Makefile +++ b/harbour/doc/Makefile @@ -6,27 +6,30 @@ ROOT = ../ DOC_FILES=\ c_std.txt \ - cmpopt.txt \ class_tp.txt \ cmdline.txt \ + cmpopt.txt \ codebloc.txt \ codestyl.txt \ + destruct.txt \ dirstruc.txt \ funclist.txt \ - genhtm.bat \ - genhtm.lnk \ - genhtm.rsp \ gmake.txt \ gtapi.txt \ hbmake.txt \ hdr_tpl.txt \ + howtobld.txt \ howtobsd.txt \ - howtosvn.txt \ howtomak.txt \ + howtorel.txt \ + howtosvn.txt \ hrb_faq.txt \ + inet.txt \ lang_id.txt \ license.txt \ + linux1st.txt \ pcode.txt \ + pp.txt \ pragma.txt \ readme.txt \ statics.txt \ diff --git a/harbour/doc/es/Makefile b/harbour/doc/es/Makefile index dca5c00fa3..de38150324 100644 --- a/harbour/doc/es/Makefile +++ b/harbour/doc/es/Makefile @@ -13,6 +13,7 @@ DOC_FILES=\ clipper.txt \ cmdline.txt \ codebloc.txt \ + codestyl.txt \ command.txt \ compiler.txt \ datetime.txt \ @@ -24,23 +25,43 @@ DOC_FILES=\ diskspac.txt \ error.txt \ eval.txt \ + file.txt \ garbage.txt \ + gnulice.txt \ harbext.txt \ + hb_apiln.txt \ hb_set.txt \ + hb_vm.txt \ hbpplib.txt \ howtobsd.txt \ + hvm.txt \ idle.txt \ + input.txt \ lang.txt \ license.txt \ + macro.txt \ math.txt \ memo.txt \ + memvar2.txt \ + misc.txt \ + nation.txt \ + objfunc.txt \ pcode.txt \ pragma.txt \ + rdd.txt \ readme.txt \ + sayget.txt \ setmode.txt \ statics.txt \ strotype.txt \ + subcodes.txt \ + tbrowse.txt \ + tclass.txt \ + tgetlist.txt \ + tlabel.txt \ tracing.txt \ + treport.txt \ + var.txt \ vm.txt \ include $(TOP)$(ROOT)config/doc.cf