From c3e4f3c26035bc93a69e5aa2ad435809e8be8a4e Mon Sep 17 00:00:00 2001
From: Mike Hommey <glandium@debian.org>
Date: Thu, 10 Sep 2009 22:10:39 +0200
Subject: Import upstream version 2.7.4

---
 bakefile/Bakefiles.bkgen | 2 +-
 bakefile/libxml2.bkl     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'bakefile')

diff --git a/bakefile/Bakefiles.bkgen b/bakefile/Bakefiles.bkgen
index f258ae5..8342de3 100644
--- a/bakefile/Bakefiles.bkgen
+++ b/bakefile/Bakefiles.bkgen
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!-- $Id: Bakefiles.bkgen,v 1.1 2005/01/27 23:59:14 veillard Exp $ -->
+<!-- $Id$ -->
 
 <bakefile-gen>
     
diff --git a/bakefile/libxml2.bkl b/bakefile/libxml2.bkl
index 8efe472..f314465 100644
--- a/bakefile/libxml2.bkl
+++ b/bakefile/libxml2.bkl
@@ -481,10 +481,10 @@
 	        <set var="__subdir">$(value)</set>
             <set var="_custom_build_files" append="1">$(XMLBASEDIR)\include\$(CONFIG_SRCNAME)</set>
             <set var="_custom_build____include_win32config_h">
-Creating the configuration file ..\$(CONFIG_DSTNAME) from ..\include\win32\$(CONFIG_SRCNAME)
+Creating the configuration file ..\$(CONFIG_DSTNAME) from ..\include\$(CONFIG_SRCNAME)
 InputPath=..\include\$(CONFIG_SRCNAME)
 
-"..\include\$(CONFIG_SRCNAME)" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
+"..\$(CONFIG_DSTNAME)" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
 $(TAB)copy "$(DOLLAR)(InputPath)" ..\$(CONFIG_DSTNAME)
             </set>
         </if>
-- 
cgit v1.2.3