From 642c252c54bfeae669c710a958068e653fb679b8 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 29 Jul 2010 15:31:47 +0000 Subject: [PATCH] 2010-07-29 17:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbrun/hbrun.prg * utils/hbrun/hbrun.hbp * utils/hbrun/Makefile - Deleted "burn-in" trick to tell hbrun where to find the Harbour include dirs. We need to find something universally useful (portable). --- harbour/ChangeLog | 8 ++++++++ harbour/utils/hbrun/Makefile | 4 ---- harbour/utils/hbrun/hbrun.hbp | 2 -- harbour/utils/hbrun/hbrun.prg | 12 +----------- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index db91b0e7d0..0bf2d43051 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-29 17:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbrun/hbrun.prg + * utils/hbrun/hbrun.hbp + * utils/hbrun/Makefile + - Deleted "burn-in" trick to tell hbrun where to find the + Harbour include dirs. We need to find something universally + useful (portable). + 2010-07-29 15:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) - mpkg_rpm.sh - mpkg_rpm_wce.sh diff --git a/harbour/utils/hbrun/Makefile b/harbour/utils/hbrun/Makefile index cf6fcdbb5f..bdc1dee478 100644 --- a/harbour/utils/hbrun/Makefile +++ b/harbour/utils/hbrun/Makefile @@ -16,8 +16,4 @@ PRG_MAIN := hbrun.prg LIBS = hbcplr hbpp hbcommon $(HB_LIBS_MT_RDD) -ifneq ($(HB_INSTALL_INC),) - HB_PRGFLAGS += -D_HBRUN_HB_INSTALL_INC=[$(HB_INSTALL_INC)] -endif - include $(TOP)$(ROOT)config/bin.mk diff --git a/harbour/utils/hbrun/hbrun.hbp b/harbour/utils/hbrun/hbrun.hbp index 4ee109aea1..b1b1c33f33 100644 --- a/harbour/utils/hbrun/hbrun.hbp +++ b/harbour/utils/hbrun/hbrun.hbp @@ -19,5 +19,3 @@ hbrun.prg -icon={allwin}../../package/harb_win.ico -icon={os2}../../package/harb_os2.ico - -{HB_INSTALL_INC}"-prgflag=-D_HBRUN_HB_INSTALL_INC=${HB_INSTALL_INC}" diff --git a/harbour/utils/hbrun/hbrun.prg b/harbour/utils/hbrun/hbrun.prg index 60154b2b12..e6f0598d4f 100644 --- a/harbour/utils/hbrun/hbrun.prg +++ b/harbour/utils/hbrun/hbrun.prg @@ -86,17 +86,7 @@ STATIC s_cDirBase /* ********************************************************************** */ PROCEDURE _APPMAIN( cFile, ... ) - LOCAL cPath, cDir, cExt - -#ifdef _HBRUN_HB_INSTALL_INC - cPath := _HBRUN_HB_INSTALL_INC - hb_FNameSplit( cPath, @cDir ) - IF ! Empty( cDir ) .AND. Left( cDir, 1 ) $ hb_osPathDelimiters() - AADD( s_aIncDir, "-I" + cPath ) - ENDIF -#else - HB_SYMBOL_UNUSED( cDir ) -#endif + LOCAL cPath, cExt cPath := getenv( "HB_INSTALL_INC" ) IF !EMPTY( cPath )