diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 727d2559f5..bf20e3abcd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-11 17:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * Makefile + % Using := instead of = + + * tests/Makefile + - Deleted support for 'pm' envvar. + + * config/global.cf + + Added PM envvar to list of misc config vars. + 2009-08-11 16:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/globsh.cf * config/win/bcc.cf diff --git a/harbour/Makefile b/harbour/Makefile index 6894a6e142..da4dae2f7f 100644 --- a/harbour/Makefile +++ b/harbour/Makefile @@ -33,12 +33,12 @@ ifeq ($(HB_POSTINST),) else # TOOPT: Use HB_SHELL variable ifneq ($(SHLVL),) - HB_POSTINST = $(TOP)$(ROOT)bin/postinst.sh $(HB_POSTINSTPARAM) + HB_POSTINST := $(TOP)$(ROOT)bin/postinst.sh $(HB_POSTINSTPARAM) else ifneq ($(OS2_SHELL),) - HB_POSTINST = $(subst /,\,$(TOP)$(ROOT)bin/postinst.cmd) $(HB_POSTINSTPARAM) + HB_POSTINST := $(subst /,\,$(TOP)$(ROOT)bin/postinst.cmd) $(HB_POSTINSTPARAM) else - HB_POSTINST = $(subst /,\,$(TOP)$(ROOT)bin/postinst.bat) $(HB_POSTINSTPARAM) + HB_POSTINST := $(subst /,\,$(TOP)$(ROOT)bin/postinst.bat) $(HB_POSTINSTPARAM) endif endif endif diff --git a/harbour/config/global.cf b/harbour/config/global.cf index ea16d1a15e..6dbf0e20d2 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -175,8 +175,9 @@ ifeq ($(HB_CONFIG_SHOWN),) ifneq ($(MAKE_381),) # Some additional ones to be given a standard name: - # HB_HOST_BUILD, HB_XBUILD, HB_WITHOUT_*, HB_REBUILD_PARSER, HB_DB_DRVEXT + # HB_HOST_BUILD [yes|lib], HB_XBUILD, HB_WITHOUT_*, HB_REBUILD_PARSER, HB_DB_DRVEXT # HB_COMMERCE, HB_CRS_LIB, HB_BUILD_VERBOSE, HB_BIN_COMPILE, HB_INC_COMPILE + # HB_POSTINST, HB_ROOTPOSTINST, HB_POSTINSTPARAM, PM ifeq ($(HB_DYNLIB),yes) $(info ! Dynamic library creation phase) @@ -706,7 +707,7 @@ export HARBOURCMD := export CLIPPER := export CLIPPERCMD := -# important only for win hosts +# relevant only for win/dos hosts MKFLAGS := --no-print-directory include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf diff --git a/harbour/tests/Makefile b/harbour/tests/Makefile index cbe50caadd..e874fccb18 100644 --- a/harbour/tests/Makefile +++ b/harbour/tests/Makefile @@ -10,10 +10,6 @@ ROOT := ../ LIBS = $(HB_LIBS_ST_RDD) -ifeq ($(PM),) - PM := $(pm) -endif - ifeq ($(PM),) # PM not defined = build all files PRG_SOURCES := \ @@ -191,7 +187,7 @@ BAD_C_SOURCES := \ include $(TOP)$(ROOT)config/test.cf -else #PM defined = build specified file +else # PM defined = build specified file ifneq ($(findstring .prg,$(PM)),) PRG_MAIN := $(PM)