From b8746abe7f4427ff4c59c29ef34de919a6239955 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 10 Sep 2010 20:12:00 +0000 Subject: [PATCH] 2010-09-10 22:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk * Will now show fatal error if HB_INSTALL_PREFIX is not set at all on non-*nix systems. Not setting this will result in missing COPYING file (which is obligatory accessory when distributing Harbour) and other crucial files like INSTALL, NEWS and ChangeLog. * INSTALL * HB_INSTALL_??? envvars deprecated. It's recommended to use HB_INSTALL_PREFIX instead and let the build system decide about the internal directory layout. Setting these to arbitrary values may break Harbour tools like hbmk2. --- harbour/ChangeLog | 14 ++++++++++++++ harbour/INSTALL | 2 ++ harbour/config/global.mk | 4 ++++ 3 files changed, 20 insertions(+) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 294a77df5a..4edc254825 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,20 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-10 22:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/global.mk + * Will now show fatal error if HB_INSTALL_PREFIX is not set + at all on non-*nix systems. Not setting this will result + in missing COPYING file (which is obligatory accessory when + distributing Harbour) and other crucial files like INSTALL, + NEWS and ChangeLog. + + * INSTALL + * HB_INSTALL_??? envvars deprecated. It's recommended to use + HB_INSTALL_PREFIX instead and let the build system decide + about the internal directory layout. Setting these to + arbitrary values may break Harbour tools like hbmk2. + 2010-09-10 07:05 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/g/QPrinter.cpp * Regenerated. diff --git a/harbour/INSTALL b/harbour/INSTALL index 43525da127..9b3b756be8 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -648,6 +648,8 @@ HARBOUR - HB_INSTALL_DOC Override directory to install documentation - HB_INSTALL_MAN Override directory to install *nix man files - HB_INSTALL_ETC Override directory to install *nix config files + NOTE: These setting are deprecated. Please use + HB_INSTALL_PREFIX to set install destination. Special ------- diff --git a/harbour/config/global.mk b/harbour/config/global.mk index aab4b86d49..f0ffb5dbe3 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -1693,6 +1693,10 @@ ifneq ($(HB_INSTALL_PREFIX),) endif endif endif +else + ifeq ($(HB_PLATFORM_UNIX),) + $(error ! Please set HB_INSTALL_PREFIX and try again.) + endif endif export HB_OBJ_DIR := $(subst /,$(DIRSEP),$(OBJ_DIR))