[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/mdds-makefile-mk.diff |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 167f27d5a6facd69babdcb37177415821bd5c532
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu May 13 18:04:21 2010 -0400

    Fixed build breakage on Windows due to mdds.
    
    * patches/dev300/mdds-makefile-mk.diff: apparently the makefile
      was not correctly written.

diff --git a/patches/dev300/mdds-makefile-mk.diff b/patches/dev300/mdds-makefile-mk.diff
index b485edf..57d1945 100644
--- a/patches/dev300/mdds-makefile-mk.diff
+++ b/patches/dev300/mdds-makefile-mk.diff
@@ -1,6 +1,6 @@
 --- /dev/null	
 +++ mdds/makefile.mk	
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,69 @@
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -61,9 +61,12 @@
 +
 +# --- post-build ---------------------------------------------------
 +
++NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
++
 +$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
 +	-@$(MKDIRHIER) $(INCCOM)
-+	@$(GNUCOPY) -r $(PACKAGE_DIR)/$(TARFILE_NAME)/inc/mdds $(INCCOM)/
++	@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/inc$/mdds $(INCCOM)
++	@$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
 +
 +$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
 +