44 lines
1.2 KiB
Text
44 lines
1.2 KiB
Text
--- src/makefile.orig Fri Nov 13 21:00:38 2020
|
|
+++ src/makefile Sat Nov 14 08:37:09 2020
|
|
@@ -13,11 +13,11 @@
|
|
# See src/gui-qt/highlight.pro for the Qt GUI compilation options
|
|
|
|
#CXX ?= clang++
|
|
-CXX ?= g++
|
|
+#CXX ?= g++
|
|
|
|
QMAKE ?= qmake
|
|
|
|
-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
|
|
+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
|
|
|
|
#CFLAGS:= -fPIC -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection
|
|
|
|
@@ -43,8 +43,8 @@
|
|
LUA_PKG_NAME=lua
|
|
endif
|
|
|
|
-LUA_CFLAGS=$(shell pkg-config --cflags ${LUA_PKG_NAME})
|
|
-LUA_LIBS=$(shell pkg-config --libs ${LUA_PKG_NAME})
|
|
+LUA_CFLAGS=-I${LOCALBASE}/include
|
|
+LUA_LIBS=-llua
|
|
|
|
# luajit lib
|
|
# LUA_LIBS=$(shell pkg-config --libs luajit)
|
|
@@ -55,13 +55,13 @@
|
|
DILU_DIR=${CORE_DIR}Diluculum/
|
|
|
|
ifndef HL_CONFIG_DIR
|
|
- HL_CONFIG_DIR = /etc/highlight/
|
|
+ HL_CONFIG_DIR = ${SYSCONFDIR}/highlight/
|
|
endif
|
|
ifndef HL_DATA_DIR
|
|
- HL_DATA_DIR = /usr/share/highlight/
|
|
+ HL_DATA_DIR = ${PREFIX}/share/highlight/
|
|
endif
|
|
ifndef HL_DOC_DIR
|
|
- HL_DOC_DIR = /usr/share/doc/highlight/
|
|
+ HL_DOC_DIR = ${PREFIX}/share/doc/highlight/
|
|
endif
|
|
|
|
ifdef PIC
|