[geany/geany] 924882: Fix installing data files with MSYS (Windows makefiles)

[Nick Treleaven]

Branch:      refs/heads/master
Author:      Nick Treleaven <nick.treleaven at btinternet.com>
Committer:   Nick Treleaven <nick.treleaven at btinternet.com>
Date:        Thu, 26 Jul 2012 12:27:58
Commit:      924882098990776127bf68b68a045a8b1c956477
             https://github.com/geany/geany/commit/924882098990776127bf68b68a045a8b1c956477

Log Message:
-----------
Fix installing data files with MSYS (Windows makefiles)


Modified Paths:
--------------
    makefile.win32

Modified: makefile.win32
10 files changed, 6 insertions(+), 4 deletions(-)
===================================================================
@@ -15,8 +15,7 @@
 WINDRES = windres.exe
 CC = gcc
 CXX = g++
-CP = copy /Y
-CP_R = xcopy /S /Y
+CP = copy /y
 RM = del
 MKDIR = mkdir
 # $/ is used as a portable directory separator
@@ -27,7 +26,6 @@ DESTDIR = C:/Program Files/Geany
 
 ifdef MSYS
 CP = cp
-CP_R = cp -r
 RM = rm -f
 / = /
 endif
@@ -70,4 +68,8 @@ install:
 	-$(MKDIR) "$(DESTDIR)/lib"
 	$(CP) plugins$/*.dll "$(DESTDIR)/lib"
 	-$(MKDIR) "$(DESTDIR)/data"
-	$(CP_R) data "$(DESTDIR)/data"
+ifdef MSYS
+	cp -r data "$(DESTDIR)"
+else
+	xcopy /s /y data "$(DESTDIR)/data"
+endif


@@ Diff output truncated at 100000 characters. @@


--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).