From 07e215b1cfb224a7e77304499df886a83080ff8a Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 27 Dec 2019 09:36:03 +1100
Subject: Backport: Use Unix paths except when deleting files, then call
 normalize to change / to \.

Backport of changeset 7851:c1e4d8c34272.
---
 gtk/makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'gtk/makefile')

diff --git a/gtk/makefile b/gtk/makefile
index b5437346e..8e433edaf 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -35,14 +35,16 @@ ifndef windir
 BASE_FLAGS += -fPIC
 endif
 
+# Take care of changing Unix style '/' directory separator to '\' on Windows
+normalize = $(if $(windir),$(subst /,\,$1),$1)
+
 ifdef windir
 CC = gcc
 DEL = del /q
-COMPLIB=$(srcdir)\..\bin\scintilla.a
 else
 DEL = rm -f
-COMPLIB=$(basedir)/bin/scintilla.a
 endif
+COMPLIB=$(basedir)/bin/scintilla.a
 
 vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib
 vpath %.c $(srcdir)
@@ -78,7 +80,7 @@ MARSHALLER=scintilla-marshal.o
 all: $(COMPLIB)
 
 clean:
-	$(DEL) *.o $(COMPLIB) *.plist
+	$(DEL) *.o $(call normalize,$(COMPLIB)) *.plist
 
 .cxx.o:
 	$(CXX) $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(CXX_BASE_FLAGS) $(CXXFLAGS) -c $<
-- 
cgit v1.2.3