Branch: refs/heads/master Author: Nick Treleaven nick.treleaven@btinternet.com Committer: Nick Treleaven nick.treleaven@btinternet.com Date: Wed, 27 Jun 2012 15:33:34 Commit: 4ad643f756c5f10f73931fc4f15954f62c267513 https://github.com/geany/geany/commit/4ad643f756c5f10f73931fc4f15954f62c2675...

Log Message: ----------- Fix makefile.win32:install for MSYS

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

Modified: makefile.win32 18 files changed, 10 insertions(+), 8 deletions(-) =================================================================== @@ -10,7 +10,7 @@ # Use localwin32.mk instead of editing variables as it is included in sub # makefiles. # 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. +# For MSYS use localwin32.mk to set CP, CP_R, RM, DIRSEP. # By default this should work in a Windows command prompt (cmd.exe).

WINDRES = windres.exe @@ -20,6 +20,8 @@ CP = copy /Y CP_R = xcopy /S /Y RM = del MKDIR = mkdir +# strip is used to prevent line wrap +DIRSEP := $(strip ) DESTDIR = C:/Program Files/Geany -include localwin32.mk

@@ -51,12 +53,12 @@ clean: deps

# likely requires admin privileges # mkdir output is ignored in case dir exists -# all paths with a backslash must be quoted for MSYS compatibility +# 'copy' seems to only accept / in the destination install: -$(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" + -$(MKDIR) "$(DESTDIR)/bin" + $(CP) geany.exe "$(DESTDIR)/bin" + -$(MKDIR) "$(DESTDIR)/lib" + $(CP) plugins$(DIRSEP)*.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).