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

2009-08-19 11:05 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/Makefile
  * harbour/config/dir.mk
  * harbour/config/global.mk
    * eliminated HB_*POSTINST* variables, now it's used only localy
      in harbour/Makefile
    * modified root Makefile detection
This commit is contained in:
Przemyslaw Czerpak
2009-08-19 09:06:21 +00:00
parent e5cb4100f8
commit 336e13b668
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -17,6 +17,14 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-19 11:05 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/Makefile
* harbour/config/dir.mk
* harbour/config/global.mk
* eliminated HB_*POSTINST* variables, now it's used only localy
in harbour/Makefile
* modified root Makefile detection
2009-08-19 10:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* external/sqlite3/sqlite3.c
* external/sqlite3/sqlite3.h

24
harbour/Makefile
View File

@@ -27,21 +27,17 @@ DIRS := \
endif
ifeq ($(HB_POSTINST),)
ifneq ($(HB_ROOTPOSTINST),)
HB_POSTINST := $(HB_ROOTPOSTINST) $(HB_POSTINSTPARAM)
include $(ROOT)config/dir.mk
ifeq ($(HB_SHELL),sh)
HB_POSTINST := $(TOP)$(ROOT)bin/postinst.sh
else
ifeq ($(HB_SHELL),os2)
HB_POSTINST := $(subst /,\,$(TOP)$(ROOT)bin/postinst.cmd)
else
# TOOPT: Use HB_SHELL variable
ifneq ($(SHLVL),)
HB_POSTINST := $(TOP)$(ROOT)bin/postinst.sh $(HB_POSTINSTPARAM)
else
ifneq ($(OS2_SHELL),)
HB_POSTINST := $(subst /,\,$(TOP)$(ROOT)bin/postinst.cmd) $(HB_POSTINSTPARAM)
else
HB_POSTINST := $(subst /,\,$(TOP)$(ROOT)bin/postinst.bat) $(HB_POSTINSTPARAM)
endif
endif
HB_POSTINST := $(subst /,\,$(TOP)$(ROOT)bin/postinst.bat)
endif
endif
include $(ROOT)config/dir.mk
install::
+$(HB_POSTINST)

5
harbour/config/dir.mk
View File

@@ -76,10 +76,5 @@ $(DIRS_MK) ::
endif
ifneq ($(HB_POSTINST),)
install::
+$(HB_POSTINST)
endif
endif
endif

9
harbour/config/global.mk
View File

@@ -199,7 +199,7 @@ ifeq ($(HB_INIT_DONE),)
ifeq ($(findstring install,$(HB_MAKECMDGOALS)),)
export HB_BUILD_PKG := no
else
ifeq ($(HB_POSTINST),)
ifneq ($(ROOT),./)
export HB_BUILD_PKG := no
endif
endif
@@ -232,9 +232,6 @@ ifeq ($(HB_INIT_DONE),)
# HB_BIN_COMPILE -> HB_BUILD_BIN_DIR
# HB_INC_COMPILE -> - (HB_BUILD_INC_DIR)
# HB_GPM_MOUSE -> HB_HAS_GPM
# HB_POSTINST -> ?
# HB_ROOTPOSTINST -> ?
# HB_POSTINSTPARAM -> ?
# HB_GPM_NOICE_DISABLE -> HB_USER_CFLAGS=-DHB_GPM_NOICE_DISABLE
# HB_GT_CRS_BCEHACK -> HB_USER_CFLAGS=-DHB_GT_CRS_BCEHACK
# HB_NCURSES_194 -> HB_USER_CFLAGS=-DHB_NCURSES_194
@@ -709,8 +706,10 @@ OBJ_DIR := obj/$(ARCH_COMP)
BIN_DIR := $(TOP)$(ROOT)bin/$(ARCH_COMP)
LIB_DIR := $(TOP)$(ROOT)lib/$(ARCH_COMP)
# define PKG_DIR only if run from root Makefile
ifneq ($(HB_POSTINST),)
ifeq ($(ROOT),./)
PKG_DIR := $(TOP)$(ROOT)pkg/$(ARCH_COMP)
else
PKG_DIR :=
endif
# Assemble relative path from OBJ_DIR to source.