[geany/geany] 78144a: Make makefile.win32:install target work without MSYS

[Nick Treleaven]

Branch:      refs/heads/master
Author:      Nick Treleaven <nick.treleaven at btinternet.com>
Committer:   Nick Treleaven <nick.treleaven at btinternet.com>
Date:        Wed, 27 Jun 2012 13:26:39
Commit:      78144ab606aba1a049cd090cbb574b4f94caf062
             https://github.com/geany/geany/commit/78144ab606aba1a049cd090cbb574b4f94caf062

Log Message:
-----------
Make makefile.win32:install target work without MSYS

Based on patch by Dimitar Zhekov.
MSYS users should now define 'CP_R = cp -r'.
Removed override of MAKE, as this is set automatically.


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

Modified: makefile.win32
27 files changed, 18 insertions(+), 9 deletions(-)
===================================================================
@@ -1,22 +1,26 @@
+# See http://www.geany.org/Support/BuildingOnWin32
 # Running make creates config.h then calls the sub makefiles.
 #
 # Other targets are:
 #	deps: delete the dependencies so they are regenerated on next make
 #	clean: clean all generated files
+#	install: install to DESTDIR
 #
 # localwin32.mk is an optional file to override make variables.
 # Use localwin32.mk instead of editing variables as it is included in sub
 # makefiles.
-# localwin32.mk to set PREFIX instead of the default C:\libs
-# For MSYS use localwin32.mk to set CP and RM.
-# By default this will work in a Windows command prompt.
+# E.g. use localwin32.mk to set PREFIX=C:/libs instead of the default C:\libs
+# For MSYS use localwin32.mk to set CP, CP_R and RM.
+# By default this should work in a Windows command prompt (cmd.exe).
 
 WINDRES = windres.exe
 CC = gcc
 CXX = g++
 CP = copy /Y
+CP_R = xcopy /S /Y
 RM = del
-MAKE = mingw32-make
+MKDIR = mkdir
+DESTDIR = C:/Program Files/Geany
 -include localwin32.mk
 
 all: config.h
@@ -44,10 +48,15 @@ clean: deps
 	$(MAKE) -C src -f makefile.win32 clean
 
 .PHONY: install
-DESTDIR='C:/Program Files/Geany'
 
-# requires admin privileges and MSYS
+# likely requires admin privileges
+# mkdir output is ignored in case dir exists
+# all paths with a backslash must be quoted for MSYS compatibility
 install:
-	cp -r data $(DESTDIR)
-	cp plugins/*.dll $(DESTDIR)/lib
-	cp geany.exe $(DESTDIR)/bin
+	-$(MKDIR) "$(DESTDIR)"
+	-$(MKDIR) "$(DESTDIR)\bin"
+	$(CP) geany.exe "$(DESTDIR)\bin"
+	-$(MKDIR) "$(DESTDIR)\lib"
+	$(CP) "plugins\*.dll" "$(DESTDIR)\lib"
+	-$(MKDIR) "$(DESTDIR)\data"
+	$(CP_R) data "$(DESTDIR)\data"


@@ Diff output truncated at 100000 characters. @@


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