1 diff -ruN libxml2-2.6.32/win32/Makefile.mingw libxml2-2.6.32-fixed/win32/Makefile.mingw
   2 --- libxml2-2.6.32/win32/Makefile.mingw	Tue Aug 14 15:50:46 2007
   3 +++ libxml2-2.6.32-fixed/win32/Makefile.mingw	Tue May 20 21:58:01 2008
   4 @@ -237,33 +237,33 @@
   5  utils : $(UTILS)
   6  
   7  clean :
   8 -	cmd.exe /C "if exist $(XML_INTDIR) rmdir /S /Q $(XML_INTDIR)"
   9 -	cmd.exe /C "if exist $(XML_INTDIR_A) rmdir /S /Q $(XML_INTDIR_A)"
  10 -	cmd.exe /C "if exist $(UTILS_INTDIR) rmdir /S /Q $(UTILS_INTDIR)"
  11 -	cmd.exe /C "if exist $(BINDIR) rmdir /S /Q $(BINDIR)"
  12 -	cmd.exe /C "if exist depends.mingw del depends.mingw"
  13 +	rm -rf $(XML_INTDIR)
  14 +	rm -rf $(XML_INTDIR_A)
  15 +	rm -rf $(UTILS_INTDIR)
  16 +	rm -rf $(BINDIR)
  17 +	rm -f depends.mingw
  18  
  19  distclean : clean
  20 -	cmd.exe /C "if exist config.* del config.*"
  21 -	cmd.exe /C "if exist Makefile del Makefile"
  22 +	rm -f config.*
  23 +	rm -f Makefile
  24  
  25  rebuild : clean all
  26  
  27  install-libs : all
  28 -	cmd.exe /C "if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml"
  29 -	cmd.exe /C "if not exist $(BINPREFIX) mkdir $(BINPREFIX)"
  30 -	cmd.exe /C "if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)"
  31 -	cmd.exe /C "copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml"
  32 -	cmd.exe /C "copy $(BINDIR)\$(XML_SO) $(SOPREFIX)"
  33 -	cmd.exe /C "copy $(BINDIR)\$(XML_A) $(LIBPREFIX)"
  34 -	cmd.exe /C "copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)"
  35 -	cmd.exe /C "copy $(BINDIR)\xml*.exe $(BINPREFIX)"
  36 +	if [ ! -d $(INCPREFIX)/libxml ]; then mkdir -p $(INCPREFIX)/libxml; fi
  37 +	if [ ! -d $(BINPREFIX) ]; then mkdir -p $(BINPREFIX); fi
  38 +	if [ ! -d $(LIBPREFIX) ]; then mkdir -p $(LIBPREFIX); fi
  39 +	cp $(XML_SRCDIR)/include/libxml/*.h $(INCPREFIX)/libxml
  40 +	cp $(BINDIR)/$(XML_SO) $(SOPREFIX)
  41 +	cp $(BINDIR)/$(XML_A) $(LIBPREFIX)
  42 +	cp $(BINDIR)/$(XML_IMP) $(LIBPREFIX)
  43 +	cp $(BINDIR)/xml*.exe $(BINPREFIX)
  44  
  45  install : install-libs
  46 -	cmd.exe /C "copy $(BINDIR)\*.exe $(BINPREFIX)"
  47 +	cp $(BINDIR)/*.exe $(BINPREFIX)
  48  
  49  install-dist : install-libs
  50 -	cmd.exe /C "copy $(BINDIR)\xml*.exe $(BINPREFIX)"
  51 +	cp $(BINDIR)/xml*.exe $(BINPREFIX)
  52  
  53  # This is a target for me, to make a binary distribution. Not for the public use,
  54  # keep your hands off :-)
  55 @@ -281,16 +281,16 @@
  56  
  57  # Makes the output directory.
  58  $(BINDIR) :
  59 -	cmd.exe /C if not exist $(BINDIR) mkdir $(BINDIR)
  60 +	if [ ! -d $(BINDIR) ]; then mkdir $(BINDIR); fi
  61  
  62  
  63  # Makes the libxml intermediate directory.
  64  $(XML_INTDIR) :
  65 -	cmd.exe /C if not exist $(XML_INTDIR) mkdir $(XML_INTDIR)
  66 +	if [ ! -d $(XML_INTDIR) ]; then mkdir $(XML_INTDIR); fi
  67  
  68  # Makes the static libxml intermediate directory.
  69  $(XML_INTDIR_A) :
  70 -	cmd.exe /C if not exist $(XML_INTDIR_A) mkdir $(XML_INTDIR_A)
  71 +	if [ ! -d $(XML_INTDIR_A) ]; then mkdir $(XML_INTDIR_A); fi
  72  
  73  # An implicit rule for libxml compilation.
  74  $(XML_INTDIR)/%.o : $(XML_SRCDIR)/%.c
  75 @@ -314,12 +314,12 @@
  76  
  77  # Creates the libxml archive.
  78  $(BINDIR)/$(XML_A) : $(BINDIR) $(XML_OBJS_A)
  79 -	$(AR) $(ARFLAGS) $(BINDIR)\$(XML_A) $(XML_OBJS_A)
  80 +	$(AR) $(ARFLAGS) $(BINDIR)/$(XML_A) $(XML_OBJS_A)
  81  
  82  
  83  # Makes the utils intermediate directory.
  84  $(UTILS_INTDIR) :
  85 -	cmd.exe /C if not exist $(UTILS_INTDIR) mkdir $(UTILS_INTDIR)
  86 +	if [ ! -d $(UTILS_INTDIR) ]; then mkdir $(UTILS_INTDIR); fi
  87  
  88  # An implicit rule for xmllint and friends.
  89  ifeq ($(STATIC),1)
  90 diff -ruN libxml2-2.6.32/win32/configure.js libxml2-2.6.32-fixed/win32/configure.js
  91 --- libxml2-2.6.32/win32/configure.js	Tue Aug 14 15:50:46 2007
  92 +++ libxml2-2.6.32-fixed/win32/configure.js	Tue May 20 21:57:24 2008
  93 @@ -266,8 +266,8 @@
  94  		vf.WriteLine("CRUNTIME=" + cruntime);
  95  		vf.WriteLine("VCMANIFEST=" + (vcmanifest? "1" : "0"));
  96  	} else if (compiler == "mingw") {
  97 -		vf.WriteLine("INCLUDE+=;" + buildInclude);
  98 -		vf.WriteLine("LIB+=;" + buildLib);
  99 +		vf.WriteLine("INCLUDE+=" + buildInclude);
 100 +		vf.WriteLine("LIB+=" + buildLib);
 101  	} else if (compiler == "bcb") {
 102  		vf.WriteLine("INCLUDE=" + buildInclude);
 103  		vf.WriteLine("LIB=" + buildLib);
 104 @@ -564,7 +564,7 @@
 105  	buildStatic = 1;
 106  }
 107  
 108 -dirSep = "\\";
 109 +dirSep = "/";
 110  if (buildBinPrefix == "")
 111  	buildBinPrefix = "$(PREFIX)" + dirSep + "bin";
 112  if (buildIncPrefix == "")