2008-08-13 15:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/config/hpux/gcc.cf
  * harbour/config/sunos/gcc.cf
    ! fixed typo in comment

  * harbour/config/dos/owatcom.cf
    ! fixed build process in POSIX SHELL environment

harbour/ChangeLog

@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-08-13 15:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/config/hpux/gcc.cf
+  * harbour/config/sunos/gcc.cf
+    ! fixed typo in comment
+
+  * harbour/config/dos/owatcom.cf
+    ! fixed build process in POSIX SHELL environment
+
 2008-08-13 13:55 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * doc/whatsnew.txt
      * Minor adjustments, typo fixes.

harbour/config/dos/owatcom.cf

@@ -11,6 +11,14 @@ EXE_EXT = .exe
 LIB_PREF =
 LIB_EXT = .lib
 
+ifeq ($(SHLVL),)
+   ECHO=echo.
+   DSEP=$(subst /,\,\)
+else
+   ECHO=echo
+   DSEP=$(subst /,\,\\)
+endif
+
 $(HB_ARCHITECTURE)_$(HB_COMPILER)_GRANDP = $(subst /,\,$(GRANDP))
 
 CC = wpp386
@@ -39,23 +47,23 @@ CPPFLAGS =
 # Note: The empty line directly before 'endef' HAVE TO exist!
 # It causes that the 'echo' command is separated by LF
 define link_file
-echo. FILE $(file) >> __link__.tmp
+$(ECHO) FILE $(subst /,$(DSEP),$(subst \,/,$(file))) >> __link__.tmp
 
 endef
 
 #Note: The empty line directly before 'endef' HAVE TO exist!
 define link_lib
-echo. LIB $(lib) >> __link__.tmp
+$(ECHO) LIB $(subst /,$(DSEP),$(subst \,/,$(lib))) >> __link__.tmp
 
 endef
 
 define link_exe_file
-echo. $(LDFLAGS) NAME $@ > __link__.tmp
+$(ECHO) $(subst /,$(DSEP),$(subst \,/,$(LDFLAGS))) NAME $@ > __link__.tmp
 $(foreach file, $(^F), $(link_file))
 $(foreach lib, $(HB_USER_LIBS), $(link_lib))
-$(foreach lib, $(subst /,\,$(LINKLIBS)), $(link_lib))
-$(foreach lib, $(subst /,\,$(RDDLIBS)), $(link_lib))
-$(foreach lib, $(subst /,\,$(GTLIBS)), $(link_lib))
+$(foreach lib, $(LINKLIBS), $(link_lib))
+$(foreach lib, $(RDDLIBS), $(link_lib))
+$(foreach lib, $(GTLIBS), $(link_lib))
 -$(LD) @__link__.tmp
 endef
 
@@ -91,24 +99,25 @@ LD_RULE = $(link_exe_file)
 
 #Note: The empty line below HAVE TO exist!
 define lib_object
-echo. -+$(file) >> __lib__.tmp
+$(ECHO) -+$(subst /,$(DSEP),$(subst \,/,$(file))) >> __lib__.tmp
 
 endef
 
 define create_library
-echo. $(subst /,\,$(LIB_DIR))\$@ > __lib__.tmp
+$(ECHO) $(subst /,$(DSEP),$(subst \,/,$(LIB_DIR)))$(DSEP)$@ > __lib__.tmp
 $(foreach file, $(^F), $(lib_object))
 $(AR) $(ARFLAGS) @__lib__.tmp
 endef
 
+
 AR = wlib
 ARFLAGS = -p=32 -c -n $(A_USR)
 AR_RULE = $(create_library)
 
 include $(TOP)$(ROOT)config/rules.cf
 
-HB := $(subst /,\,$(HB))
-HB_FLAGS := $(subst /,\,$(HB_FLAGS))
+HB := $(subst /,$(DSEP),$(subst \,/,$(HB)))
+HB_FLAGS := $(subst /,$(DSEP),$(subst \,/,$(HB_FLAGS)))
 
 # work arround to DOS command line size limit
 export HARBOURCMD := $(HB_FLAGS)

harbour/config/hpux/gcc.cf

@@ -17,7 +17,7 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 CFLAGS = -Wall -W
 LDFLAGS =
 
-# uncomment this if you want to farce relocateable code for .so libs
+# uncomment this if you want to force relocatable code for .so libs
 # it's necessary on some platforms but can reduce performance
 #CFLAGS += -fPIC
 

harbour/config/sunos/gcc.cf

@@ -16,7 +16,7 @@ CPPFLAGS = -I. -I$(HB_INC_COMPILE)
 
 CFLAGS = -Wall -W
 
-# uncomment this if you want to farce relocateable code for .so libs
+# uncomment this if you want to force relocatable code for .so libs
 # it's necessary on some platforms but can reduce performance
 #CFLAGS += -fPIC
 
@@ -77,7 +77,8 @@ ifneq ($(findstring -DHB_EXT_ZLIB, $(C_USR)),)
 LINKLIBS += -lz
 endif
 
-LINKLIBS += -lm -lrt -lsocket -lnsl -lresolv
+LINKLIBS += -lm -lrt
+LINKLIBS += -lsocket -lnsl -lresolv
 
 LDFLAGS = $(LINKPATHS)