[Ccom-develop] ccom/misc makefile.dj,1.3,1.4 makefile.mgw,1.5,1.6

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

Update of /cvsroot/ccomx/ccom/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28395/misc

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

Index: makefile.mgw
===================================================================
RCS file: /cvsroot/ccomx/ccom/misc/makefile.mgw,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile.mgw	23 May 2004 20:53:01 -0000	1.5
--- makefile.mgw	24 May 2004 00:23:20 -0000	1.6
***************
*** 97,100 ****
--- 97,114 ----
  SYSTEM_LIB_DIR_D = $(MINGDIR_D)\lib
  
+ 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
+ 
  # -------- Set up mktext --------
  ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
***************
*** 275,292 ****
  ifndef STATICLINK
  $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME)
! 	copy $(subst /,\,$< $@)
  endif
  
  $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME)
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/ccom.h: include/ccom.h
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/ccom:
! 	md $(subst /,\,$@)
  
  $(SYSTEM_INCLUDE_DIR)/ccom/%.h: include/ccom/%.h include/ccom
! 	copy $(subst /,\,$< $@)
  
  endif # ifdef CROSSCOMPILE else
--- 289,306 ----
  ifndef STATICLINK
  $(WINDIR_U)/$(DLL_BASENAME): $(DLL_NAME)
! 	$(CP) $(subst /,\,$< $@)
  endif
  
  $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME)
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/ccom.h: include/ccom.h
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/ccom:
! 	$(MKDIR) $(subst /,\,$@)
  
  $(SYSTEM_INCLUDE_DIR)/ccom/%.h: include/ccom/%.h include/ccom
! 	$(CP) $(subst /,\,$< $@)
  
  endif # ifdef CROSSCOMPILE else

Index: makefile.dj
===================================================================
RCS file: /cvsroot/ccomx/ccom/misc/makefile.dj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** makefile.dj	8 Feb 2004 20:47:22 -0000	1.3
--- makefile.dj	24 May 2004 00:23:20 -0000	1.4
***************
*** 70,73 ****
--- 70,86 ----
  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
  # -------- Set up mktext --------
  ALLEGRO_DAT = $(subst /,\,$(ALLEGRO_DAT_X))
***************
*** 199,215 ****
  
  $(SYSTEM_INCLUDE_DIR)/ccom.h: include/ccom.h
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/ccom:
! 	md $(subst /,\,$@)
  
  $(SYSTEM_INCLUDE_DIR)/ccom/%.h: include/ccom/%.h include/ccom
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX)
! 	copy $(subst /,\,$< $@)
  
  $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME)
! 	copy $(subst /,\,$< $@)
  
  endif # ifdef CROSSCOMPILE else
--- 212,228 ----
  
  $(SYSTEM_INCLUDE_DIR)/ccom.h: include/ccom.h
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_INCLUDE_DIR)/ccom:
! 	$(MKDIR) $(subst /,\,$@)
  
  $(SYSTEM_INCLUDE_DIR)/ccom/%.h: include/ccom/%.h include/ccom
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_INFO_DIR)/%$(INFO_SUFFIX): docs/%$(INFO_SUFFIX)
! 	$(CP) $(subst /,\,$< $@)
  
  $(SYSTEM_LIB_DIR)/$(LIB_BASENAME): $(LIB_NAME)
! 	$(CP) $(subst /,\,$< $@)
  
  endif # ifdef CROSSCOMPILE else