Mon Jun 07 20:42:04 1999 Gonzalo A. Diethelm <Gonzalo.Diethelm@jda.cl>

harbour/ChangeLog

@@ -1,3 +1,10 @@
+Mon Jun 07 20:42:04 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
+
+	* config/dir.cf: 
+	* config/global.cf: 
+	* config/install.cf: 
+	Made a mistake in my previous commit. This one works.
+
 Mon Jun 07 20:20:32 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
 
 	* config/bin.cf: 
@@ -1686,14 +1693,6 @@ Thu May 20 16:03:24 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
       NB! Not needed for 32-bit compilers.
 
 Tue May 11 18:53:43 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
-<<<<<<< ChangeLog
-=======
-
-        * Makefile:
-        Added obj to the list of directories.
->>>>>>> 1.78
-
-<<<<<<< ChangeLog
         * Makefile:
         Added obj to the list of directories.
 
@@ -1722,33 +1721,6 @@ Tue May 11 18:53:43 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
         * obj/Makefile:
         Added these two Makefiles.
 
-=======
-        * source/Makefile:
-        Added rdd to the list of directories.
-
-        * source/rtl/Makefile:
-        Added gtapi.c to the list of C sources.
-
-        * source/rtl/gtapi.c:
-        Got rid of two warnings with gcc.
-
-        * source/rtl/environ.c:
-        Made sure it compiles with gcc.
-        There was a missing #endif.
-
-        * source/tools/stringp.prg:
-        * tests/working/debugtst.prg:
-        Replaced Debug() with HBDebug(), otherwise the generated C source
-        collides with the macro DEBUG.
-
-        * source/vm/hvm.c:
-        Corrected a comment.
-
-        * source/rdd/Makefile:
-        * obj/Makefile:
-        Added these two Makefiles.
-
->>>>>>> 1.78
 19990511-19:20 Eddie Runia
   * source/rtl/classes.c
     (Default) parameter self added to INLINE methods

harbour/config/dir.cf

@@ -5,7 +5,7 @@
 all : first
 
 first clean install ::
-ifeq (Windows,$(findstring Windows,$(OS)))
+ifeq ($(SHLVL),)
 	@cmd /c FOR /D %d IN ($(DIRS)) DO @$(MAKE) -C %d $@
 else  # ! Windows
 	@for d in $(DIRS); do \

harbour/config/global.cf

@@ -7,7 +7,7 @@ all : first
 GRANDP = ../../
 ARCH = $(HB_ARCHITECTURE)/$(HB_COMPILER)
 
-ifeq (Windows,$(findstring Windows,$(OS)))
+ifeq ($(SHLVL),)
 ARCH_DIR = $(subst /,\\,$(ARCH))\\
 else  # ! Windows
 ARCH_DIR = $(ARCH)/
@@ -16,12 +16,12 @@ endif
 include $(TOP)$(ROOT)config/$(ARCH).cf
 
 dirbase::
-ifeq (Windows,$(findstring Windows,$(OS)))
+ifeq ($(SHLVL),)
 	-$(MD) $(HB_ARCHITECTURE)
 	-$(MD) $(ARCH_DIR) >NUL
 else  # ! Windows
-	@[ -d $(HB_ARCHITECTURE) ] || $(MD) $(HB_ARCHITECTURE) ]; \
-	 [ -d $(ARCH_DIR) ] || $(MD) $(ARCH_DIR) ]
+	@[ -d $(HB_ARCHITECTURE) ] || $(MD) $(HB_ARCHITECTURE); \
+	 [ -d $(ARCH) ] || $(MD) $(ARCH)
 endif
 
 clean::

harbour/config/install.cf

@@ -3,7 +3,7 @@
 #
 
 install:: first
-ifeq (Windows,$(findstring Windows,$(OS)))
+ifeq ($(SHLVL),)
 	@cmd /c FOR %f IN ($(INSTALL_OBJS)) DO @COPY %f $(INSTALL_DIR)
 else  # ! Windows
 	@if [ ! -d $(INSTALL_DIR) ]; \