SF.net SVN: geany:[5685] trunk

[eht16 at users.sourceforge.net]

Revision: 5685
          http://geany.svn.sourceforge.net/geany/?rev=5685&view=rev
Author:   eht16
Date:     2011-04-03 16:38:31 +0000 (Sun, 03 Apr 2011)

Log Message:
-----------
Replace escape character '\' by slash '/' in paths in the Windows Makefiles (patch by Matthew Brush, thanks).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/makefile.win32
    trunk/scintilla/makefile.win32
    trunk/tagmanager/makefile.win32

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-04-03 16:35:27 UTC (rev 5684)
+++ trunk/ChangeLog	2011-04-03 16:38:31 UTC (rev 5685)
@@ -4,6 +4,9 @@
    Update Scintilla to version 2.25.
  * version.txt, Makefile.am:
    Add Scintilla's version.txt file.
+ * scintilla/makefile.win32, tagmanager/makefile.win32, makefile.win32:
+   Replace escape character '\' by slash '/' in paths in the
+   Windows Makefiles (patch by Matthew Brush, thanks).
 
 
 2011-04-03  Colomban Wendling  <colomban(at)geany(dot)org>

Modified: trunk/makefile.win32
===================================================================
--- trunk/makefile.win32	2011-04-03 16:35:27 UTC (rev 5684)
+++ trunk/makefile.win32	2011-04-03 16:38:31 UTC (rev 5685)
@@ -22,7 +22,7 @@
 # Note: && is needed after cd because each line is executed in a different
 # shell. (cd .. is just for clarity).
 all: check-tools config.h
-	cd tagmanager\mio && $(MAKE) -f makefile.win32 && cd ..\..
+	cd tagmanager/mio && $(MAKE) -f makefile.win32 && cd ../..
 	cd tagmanager && $(MAKE) -f makefile.win32 && cd ..
 	cd scintilla && $(MAKE) -f makefile.win32 && cd ..
 	cd plugins && $(MAKE) -f makefile.win32 && cd ..
@@ -38,14 +38,14 @@
 	$(CP) $< $@
 
 deps:
-	-$(RM) tagmanager\mio\deps.mak tagmanager\deps.mak scintilla\deps.mak plugins\deps.mak src\deps.mak
+	-$(RM) tagmanager/mio/deps.mak tagmanager/deps.mak scintilla/deps.mak plugins/deps.mak src/deps.mak
 
 # used by src/makefile.win32 to avoid del ../file which is an error
 clean-local:
 	-$(RM) geany_private.res geany.exe
 
 clean: deps
-	cd tagmanager\mio && $(MAKE) -f makefile.win32 clean && cd ..\..
+	cd tagmanager/mio && $(MAKE) -f makefile.win32 clean && cd ../..
 	cd tagmanager && $(MAKE) -f makefile.win32 clean && cd ..
 	cd scintilla && $(MAKE) -f makefile.win32 clean && cd ..
 	cd plugins && $(MAKE) -f makefile.win32 clean && cd ..

Modified: trunk/scintilla/makefile.win32
===================================================================
--- trunk/scintilla/makefile.win32	2011-04-03 16:35:27 UTC (rev 5684)
+++ trunk/scintilla/makefile.win32	2011-04-03 16:38:31 UTC (rev 5685)
@@ -138,7 +138,7 @@
 	$(RANLIB) $@
 
 deps.mak:
-	$(CC) -MM  $(CXXFLAGS) gtk\*.cxx lexers\*.cxx lexlib\*.cxx src\*.cxx >deps.mak
+	$(CC) -MM  $(CXXFLAGS) gtk/*.cxx lexers/*.cxx lexlib/*.cxx src/*.cxx >deps.mak
 
 # Generate header dependencies with "make deps.mak"
 include deps.mak

Modified: trunk/tagmanager/makefile.win32
===================================================================
--- trunk/tagmanager/makefile.win32	2011-04-03 16:35:27 UTC (rev 5684)
+++ trunk/tagmanager/makefile.win32	2011-04-03 16:38:31 UTC (rev 5685)
@@ -3,7 +3,7 @@
 CC = gcc
 AR = ar
 RANLIB = ranlib
-PREFIX = C:\libs
+PREFIX = C:/libs
 RM = del
 -include ../localwin32.mk
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.