[Cbar-develop] cbar/misc makefile.dj,1.4,1.5 makefile.mgw,1.7,1.8

[Rasmus M. <ras...@us...>]

Update of /cvsroot/cbar/cbar/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28081/misc

Modified Files:
	makefile.dj makefile.mgw 
Log Message:
Fixed the use of UNIX_TOOLS if present

Index: makefile.mgw
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.mgw,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.mgw	23 May 2004 23:07:00 -0000	1.7
--- makefile.mgw	24 May 2004 00:22:00 -0000	1.8
***************
*** 97,100 ****
--- 97,118 ----
  SYSTEM_LIB_DIR_D = $(MINGDIR_D)\lib
  
+ ifdef CROSSCOMPILE
+    UNIX_TOOLS = 1
+ endif
+ 
+ ifneq (,$(findstring /sh.exe,$(SHELL)))
+   UNIX_TOOLS = 1
+ endif
+ 
+ ifdef UNIX_TOOLS
+   CP = cp
+   RM = rm
+   MKDIR = mkdir
+ else
+   CP = copy
+   RM = del
+   MKDIR = md
+ endif
+ 
  ifdef UNIX_TOOLS
  # -------- Set up mktext --------
***************
*** 294,311 ****
  ifndef STATICLINK
  $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME)
! 	copy $(subst /,\,$< $@)
  endif
  
  $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME)
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cbar:
! 	md $(subst /,\,$@)
  
  $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar
! 	copy $(subst /,\,$< $@)
  
  endif # ifdef CROSSCOMPILE else
--- 312,329 ----
  ifndef STATICLINK
  $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME)
! 	$(CP) $(subst /,\,$< $@)
  endif
  
  $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME)
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cbar:
! 	$(MKDIR) $(subst /,\,$@)
  
  $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar
! 	$(CP) $(subst /,\,$< $@)
  
  endif # ifdef CROSSCOMPILE else

Index: makefile.dj
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/makefile.dj,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makefile.dj	8 Feb 2004 11:34:11 -0000	1.4
--- makefile.dj	24 May 2004 00:22:00 -0000	1.5
***************
*** 72,75 ****
--- 72,88 ----
  SYSTEM_INFO_DIR = $(DJGPPDIR_D)\info
  
+ ifneq (,$(findstring /sh.exe,$(SHELL)))
+   UNIX_TOOLS = 1
+ endif
+ 
+ ifdef UNIX_TOOLS
+   CP = cp
+   RM = rm
+   MKDIR = mkdir
+ else
+   CP = copy
+   RM = del
+   MKDIR = md
+ endif
  
  ifdef UNIX_TOOLS
***************
*** 230,246 ****
  
  $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME)
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cbar:
! 	md $(subst /,\,$@)
  
  $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX)
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar
! 	copy $(subst /,\,$< $@)
  
  endif # ifdef CROSSCOMPILE else
--- 243,259 ----
  
  $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME)
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cbar.h: include/cbar.h
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cbar:
! 	$(MKDIR) $(subst /,\,$@)
  
  $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX)
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/cbar/%.h: include/cbar/%.h include/cbar
! 	$(CP) $(subst /,\,$< $@)
  
  endif # ifdef CROSSCOMPILE else