incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1291096 - /incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk
Date Mon, 20 Feb 2012 00:19:15 GMT
Author: pfg
Date: Mon Feb 20 00:19:14 2012
New Revision: 1291096

URL: http://svn.apache.org/viewvc?rev=1291096&view=rev
Log:
On Windows it's OK to use GNU copy.

Modified:
    incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk

Modified: incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk?rev=1291096&r1=1291095&r2=1291096&view=diff
==============================================================================
--- incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk Mon Feb 20 00:19:14 2012
@@ -267,14 +267,14 @@ hack_msitemplates .PHONY:
 	-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
 	-$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
 	-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
-	$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
-	$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
-	$(GNUCOPY) $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
-	$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
-	$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
-	$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
-	$(GNUCOPY) $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
-	$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
+	$(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
+	$(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
+	$(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
+	$(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
+	$(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
+	$(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
+	$(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
+	$(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
 	$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
 	$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
 	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp



Mime
View raw message