fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-08-17 09:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/global.cf
    + Setting HB_INSTALL_PREFIX (if not set) to PREFIX or DESTDIR (if set,
      in that order), on *nix systems.
This commit is contained in:
Viktor Szakats
2009-08-17 07:11:52 +00:00
parent b0ecbf33df
commit b10e952e47
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -17,6 +17,11 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-17 09:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/global.cf
+ Setting HB_INSTALL_PREFIX (if not set) to PREFIX or DESTDIR (if set,
in that order), on *nix systems.
2009-08-16 21:53 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbxbp/xbpgeneric.prg
! Optimized AppEvent()
@@ -72,7 +77,7 @@
* contrib/hbqt/qth/QRegion.qth
* contrib/hbqt/qth/QSize.qth
* contrib/hbqt/qth/QSizeF.qth
! Tweaked some definitions.
2009-08-16 10:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

14
harbour/config/global.cf
View File

@@ -838,7 +838,7 @@ export HB_PKGNAMI
HB_INSTALL_PREFIX_ORI := $(HB_INSTALL_PREFIX)
ifeq ($(HB_BUILD_PKG),yes)
ifeq ($(HB_INIT_DONE),)
export HB_TOP := $(subst /,$(DIRSEP),$(abspath $(TOP)$(ROOT)))
export HB_TOP := $(subst /,$(DIRSEP),$(realpath $(TOP)$(ROOT)))
HB_INSTALL_PREFIX := $(subst /,$(DIRSEP),$(abspath $(PKG_DIR)/$(HB_PKGNAME)))
HB_BIN_INSTALL :=
@@ -853,8 +853,16 @@ else
ifeq ($(HB_UNIX_COMPATIBLE),no)
HB_INSTALL_PREFIX := $(realpath $(TOP)$(ROOT))
else
# Stick to *nix customs. I don't like it, it needs admin.
HB_INSTALL_PREFIX := /usr/local
ifneq ($(PREFIX),)
HB_INSTALL_PREFIX := $(PREFIX)
else
ifneq ($(DESTDIR),)
HB_INSTALL_PREFIX := $(DESTDIR)
else
# Stick to *nix customs. I don't like it, it needs admin.
HB_INSTALL_PREFIX := /usr/local
endif
endif
endif
HB_INSTALL_PREFIX := $(subst /,$(DIRSEP),$(HB_INSTALL_PREFIX))