diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7bf6cf4402..b3343e365c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,10 @@ +2000-08-02 15:55 UTC-0400 David G. Holm + + * config/os2/global.cf + ! Restored to version 1.2, because 1.3 had no tab + characters, then reapplied the changes from 1.3 + to the restored 1.2 and committed it as 1.4. + 2000-08-02 21:10 UTC+0100 Ryszard Glab *doc/whatsnew.txt diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf index 29567af0d5..e2ac759c44 100644 --- a/harbour/config/os2/global.cf +++ b/harbour/config/os2/global.cf @@ -1,111 +1,55 @@ # - # $Id$ - # - - all : first - - HB_GT_LIBS=\ - gtos2 \ - gtpca \ - gtstd \ - - ifeq ($(HB_GT_LIB),) - HB_GT_LIB = gtos2 - endif - - ifeq ($(SHLVL),) # An OS/2 command shell - - ARCH_DIR = $(ARCH) - OS2_ARCH_DIR = $(subst /,\,$(ARCH)) - MK = $(subst /,\,$(subst \~,~,$(MAKE))) - - RM = del /n - RD = rmdir - CP = copy - MV = move - MD = md - - dirbase:: - -CMD.EXE /c IF NOT EXIST $(HB_ARCHITECTURE) $(MD) $(HB_ARCHITECTURE) - -CMD.EXE /c IF NOT EXIST $(OS2_ARCH_DIR) $(MD) $(OS2_ARCH_DIR) - - clean:: - - -CMD.EXE /c IF EXIST $(OS2_ARCH_DIR)\\*.* $(RM) $(OS2_ARCH_DIR)\\*.* - + -CMD.EXE /c IF EXIST $(OS2_ARCH_DIR)\*.* $(RM) $(OS2_ARCH_DIR)\*.* -CMD.EXE /c IF EXIST $(OS2_ARCH_DIR) $(RD) $(OS2_ARCH_DIR) - -CMD.EXE /c IF EXIST $(HB_ARCHITECTURE) $(RD) $(HB_ARCHITECTURE) - - else # bash - - ARCH_DIR = $(ARCH)/ - MK = $(MAKE) - - RM = rm -f - RD = rm -f -r - CP = cp -f - MV = mv -f - MD = mkdir - - dirbase:: - @[ -d $(HB_ARCHITECTURE) ] || $(MD) $(HB_ARCHITECTURE); \ - [ -d $(ARCH) ] || $(MD) $(ARCH) - - clean:: - -$(RD) $(ARCH_DIR) - - endif - - \ No newline at end of file