Fernando Apesteguía
c6d6461c24
From ChangeLog (https://github.com/nifty-site-manager/nsm/releases/tag/v2.3.9): * added exprtk_disable_caseinsensitivity for ExprTk * merged PR from Mamadou fixing support for compiling with Lua 5.2 and 5.1 * added !mf option to definitions * added in types std::vector<double> and std::vector<string> * added in std::vector. fns at, erase, pop_back, push_back, set, size (also member fns) * added in stream. fns close, open (also member fns) * added in exprtk.compile, exprtk.eval, exprtk.load and exprtk.str fns for f++/n++ * added in exprtk_compile, exprtk_eval, exprtk_load and exprtk_str fns for Lua * added in to_string fn for ExprTk * fixed so that fn name/options/params are parsed with f++ always * fixed various bugs * made various improvements PR: 246489 Submitted by: info@babaei.net (maintainer)
85 lines
3.4 KiB
Plaintext
85 lines
3.4 KiB
Plaintext
--- Makefile.orig 2020-05-15 16:07:18 UTC
|
|
+++ Makefile
|
|
@@ -3,7 +3,7 @@ objects=nsm.o ConsoleColor.o DateTimeInfo.o Directory.
|
|
cppfiles=nsm.cpp ConsoleColor.cpp DateTimeInfo.cpp Directory.cpp Expr.cpp ExprtkFns.cpp Filename.cpp FileSystem.cpp Getline.cpp GitInfo.cpp hashtk/HashTk.cpp Lolcat.cpp LuaFns.cpp Lua.cpp NumFns.cpp Pagination.cpp Parser.cpp Path.cpp ProjectInfo.cpp Quoted.cpp StrFns.cpp SystemInfo.cpp Title.cpp TrackedInfo.cpp Variables.cpp WatchList.cpp
|
|
|
|
DESTDIR?=
|
|
-PREFIX?=/usr/local
|
|
+PREFIX?=%%LOCALBASE%%
|
|
BINDIR=${DESTDIR}${PREFIX}/bin
|
|
LIBDIR=${DESTDIR}${PREFIX}/lib
|
|
|
|
@@ -79,58 +79,58 @@ ifeq ($(BUNDLED),0)
|
|
else ifeq ($(LUA_VERSION),x)
|
|
ifeq ($(detected_OS),FreeBSD) # FreeBSD
|
|
CXXFLAGS+= -D__LUA_VERSION_x__
|
|
- LINK+= -L/usr/local/lib -llua -lm -ldl
|
|
+ LINK+= -L%%LOCALBASE%%/lib -llua -lm -ldl
|
|
else # *nix
|
|
CXXFLAGS+= -D__LUA_VERSION_x__
|
|
- LINK+= -L/usr/local/lib -llua -ldl
|
|
+ LINK+= -L%%LOCALBASE%%/lib -llua -ldl
|
|
endif
|
|
else ifeq ($(LUA_VERSION),5.4)
|
|
ifeq ($(detected_OS),FreeBSD) # FreeBSD
|
|
CXXFLAGS+= -D__LUA_VERSION_5_4__
|
|
- LINK+= -L/usr/local/lib -llua-5.4 -lm -ldl
|
|
+ LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -lm -ldl
|
|
else # *nix
|
|
CXXFLAGS+= -D__LUA_VERSION_5_4__
|
|
- LINK+= -L/usr/local/lib -llua-5.4 -ldl
|
|
+ LINK+= -L%%LOCALBASE%%/lib -llua-5.4 -ldl
|
|
endif
|
|
else ifeq ($(LUA_VERSION),5.3)
|
|
ifeq ($(detected_OS),FreeBSD) # FreeBSD
|
|
CXXFLAGS+= -D__LUA_VERSION_5_3__
|
|
- LINK+= -L/usr/local/lib -llua-5.3 -lm -ldl
|
|
+ LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -lm -ldl
|
|
else # *nix
|
|
CXXFLAGS+= -D__LUA_VERSION_5_3__
|
|
- LINK+= -L/usr/local/lib -llua-5.3 -ldl
|
|
+ LINK+= -L%%LOCALBASE%%/lib -llua-5.3 -ldl
|
|
endif
|
|
else ifeq ($(LUA_VERSION),5.2)
|
|
ifeq ($(detected_OS),FreeBSD) # FreeBSD
|
|
CXXFLAGS+= -D__LUA_VERSION_5_2__
|
|
- LINK+= -L/usr/local/lib -llua-5.2 -lm -ldl
|
|
+ LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -lm -ldl
|
|
else # *nix
|
|
CXXFLAGS+= -D__LUA_VERSION_5_2__
|
|
- LINK+= -L/usr/local/lib -llua-5.2 -ldl
|
|
+ LINK+= -L%%LOCALBASE%%/lib -llua-5.2 -ldl
|
|
endif
|
|
else ifeq ($(LUA_VERSION),5.1)
|
|
ifeq ($(detected_OS),FreeBSD) # FreeBSD
|
|
CXXFLAGS+= -D__LUA_VERSION_5_1__
|
|
- LINK+= -L/usr/local/lib -llua-5.1 -lm -ldl
|
|
+ LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -lm -ldl
|
|
else # *nix
|
|
CXXFLAGS+= -D__LUA_VERSION_5_1__
|
|
- LINK+= -L/usr/local/lib -llua-5.1 -ldl
|
|
+ LINK+= -L%%LOCALBASE%%/lib -llua-5.1 -ldl
|
|
endif
|
|
else ifeq ($(LUAJIT_VERSION),2.0)
|
|
ifeq ($(detected_OS),FreeBSD) # FreeBSD
|
|
CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
|
|
- LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1
|
|
+ LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1
|
|
else # *nix
|
|
CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
|
|
- LINK+= -ldl -L/usr/local/lib -lluajit-5.1
|
|
+ LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1
|
|
endif
|
|
else
|
|
ifeq ($(detected_OS),FreeBSD) # FreeBSD
|
|
CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
|
|
- LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1
|
|
+ LINK+= -ldl -lm -L%%LOCALBASE%%/lib -lluajit-5.1
|
|
else # *nix
|
|
CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
|
|
- LINK+= -ldl -L/usr/local/lib -lluajit-5.1
|
|
+ LINK+= -ldl -L%%LOCALBASE%%/lib -lluajit-5.1
|
|
endif
|
|
endif
|
|
else
|