4d8828efed
This either changes the pkgbase to match the directory name or the other way around. The motivation for this is to make it possible to automatically generate an URL to the PKGBUILD file from the package information alone.
83 lines
2.2 KiB
Diff
83 lines
2.2 KiB
Diff
From 4591a15982077c8a1d4c9505aeb1025722129562 Mon Sep 17 00:00:00 2001
|
|
From: David Macek <david.macek.0@gmail.com>
|
|
Date: Thu, 12 Feb 2015 12:57:31 +0100
|
|
Subject: [PATCH 1/3] Use POSIX tools in makefiles
|
|
|
|
---
|
|
scintilla/gtk/makefile | 2 +-
|
|
scite/win32/makefile | 24 +++---------------------
|
|
2 files changed, 4 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/scintilla/gtk/makefile b/scintilla/gtk/makefile
|
|
index cdf1aa1..0d4397e 100644
|
|
--- a/scintilla/gtk/makefile
|
|
+++ b/scintilla/gtk/makefile
|
|
@@ -32,8 +32,8 @@ endif
|
|
endif
|
|
|
|
ifdef windir
|
|
CC = gcc
|
|
-DEL = del /q
|
|
+DEL = rm -f
|
|
COMPLIB=..\bin\scintilla.a
|
|
else
|
|
DEL = rm -f
|
|
diff --git a/scite/win32/makefile b/scite/win32/makefile
|
|
index daffb70..e5ccb62 100644
|
|
--- a/scite/win32/makefile
|
|
+++ b/scite/win32/makefile
|
|
@@ -10,24 +10,6 @@ WINDRES ?= windres
|
|
ifeq ($(OS),Windows_NT)
|
|
CC = gcc
|
|
DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del)
|
|
- COPY = xcopy /Y
|
|
- VER = cmd /c ver
|
|
- # Discover Windows version by running 'VER' command and parsing output
|
|
- # For Windows 2000 looks like:Microsoft Windows 2000 [Version 5.00.2195]
|
|
- WINVERWORDS:=$(wordlist 1,2,$(subst ., ,$(lastword $(shell $(VER)))))
|
|
- WINVER:=$(firstword $(WINVERWORDS)).$(lastword $(WINVERWORDS))
|
|
- # Windows NT 4 and Windows 2000 do not support themes so turn off
|
|
-ifeq '$(WINVER)' '4.0'
|
|
- VERSION_DEFINES:=-DDISABLE_THEMES -DWIN_TARGET=0x0400
|
|
-else
|
|
-ifeq '$(WINVER)' '5.00'
|
|
- VERSION_DEFINES:=-DDISABLE_THEMES
|
|
-else
|
|
- UXLIB:=-luxtheme
|
|
-endif
|
|
-endif
|
|
-else
|
|
- DEL = rm -f
|
|
COPY = cp -a
|
|
UXLIB:=-luxtheme
|
|
endif
|
|
@@ -163,14 +145,14 @@ embedded: ../src/Embedded.properties
|
|
|
|
../bin/Scintilla.dll: ../../scintilla/bin/Scintilla.dll
|
|
ifeq ($(OS),Windows_NT)
|
|
- $(COPY) $(subst /,\, $< $(@D))
|
|
+ $(COPY) $^ $(@D)
|
|
else
|
|
$(COPY) $^ $(@D)
|
|
endif
|
|
|
|
../bin/SciLexer.dll: ../../scintilla/bin/SciLexer.dll
|
|
ifeq ($(OS),Windows_NT)
|
|
- $(COPY) $(subst /,\, $< $(@D))
|
|
+ $(COPY) $^ $(@D)
|
|
else
|
|
$(COPY) $^ $(@D)
|
|
endif
|
|
@@ -178,7 +160,7 @@ endif
|
|
# Using '/' rather than '\' as that allows make to match the next rule
|
|
../bin/%.properties: ../src/%.properties
|
|
ifeq ($(OS),Windows_NT)
|
|
- $(COPY) $(subst /,\, $< $(@D))
|
|
+ $(COPY) $^ $(@D)
|
|
else
|
|
$(COPY) $^ $(@D)
|
|
endif
|
|
--
|
|
2.3.0
|
|
|