You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
1.9 KiB
63 lines
1.9 KiB
8 years ago
|
From 57e1907d6813565e29990864807bdceb393653d3 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <57e1907d6813565e29990864807bdceb393653d3.1390660080.git.striper@gmx.de>
|
||
|
|
From: striper <striper@gmx.de>
|
||
|
|
Date: Sat, 25 Jan 2014 15:27:54 +0100
|
||
|
|
Subject: [PATCH] - fix coolstream build
|
||
|
|
|
||
|
|
---
|
||
|
|
Makefile | 2 +-
|
||
|
|
src/Makefile | 2 +-
|
||
|
|
src/luaconf.h | 3 +--
|
||
|
|
3 files changed, 3 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index d2c7db4..2dea130 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -14,7 +14,7 @@ INSTALL_TOP= /usr/local
|
||
|
|
INSTALL_BIN= $(INSTALL_TOP)/bin
|
||
|
|
INSTALL_INC= $(INSTALL_TOP)/include
|
||
|
|
INSTALL_LIB= $(INSTALL_TOP)/lib
|
||
|
|
-INSTALL_MAN= $(INSTALL_TOP)/man/man1
|
||
|
|
+INSTALL_MAN= $(INSTALL_TOP)/.remove
|
||
|
|
INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
|
||
|
|
INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
|
||
|
|
|
||
|
|
diff --git a/src/Makefile b/src/Makefile
|
||
|
|
index 7b4b2b7..395d5ba 100644
|
||
|
|
--- a/src/Makefile
|
||
|
|
+++ b/src/Makefile
|
||
|
|
@@ -103,7 +103,7 @@ freebsd:
|
||
|
|
generic: $(ALL)
|
||
|
|
|
||
|
|
linux:
|
||
|
|
- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline"
|
||
|
|
+ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -fPIC" SYSLIBS="-Wl,-E -ldl"
|
||
|
|
|
||
|
|
macosx:
|
||
|
|
$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc
|
||
|
|
diff --git a/src/luaconf.h b/src/luaconf.h
|
||
|
|
index 18be9a9..131747b 100644
|
||
|
|
--- a/src/luaconf.h
|
||
|
|
+++ b/src/luaconf.h
|
||
|
|
@@ -43,7 +43,6 @@
|
||
|
|
#if defined(LUA_USE_LINUX)
|
||
|
|
#define LUA_USE_POSIX
|
||
|
|
#define LUA_USE_DLOPEN /* needs an extra library: -ldl */
|
||
|
|
-#define LUA_USE_READLINE /* needs some extra libraries */
|
||
|
|
#define LUA_USE_STRTODHEX /* assume 'strtod' handles hex formats */
|
||
|
|
#define LUA_USE_AFORMAT /* assume 'printf' handles 'aA' specifiers */
|
||
|
|
#define LUA_USE_LONGLONG /* assume support for long long */
|
||
|
|
@@ -100,7 +99,7 @@
|
||
|
|
#else /* }{ */
|
||
|
|
|
||
|
|
#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
|
||
|
|
-#define LUA_ROOT "/usr/local/"
|
||
|
|
+#define LUA_ROOT "/"
|
||
|
|
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
|
||
|
|
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
|
||
|
|
#define LUA_PATH_DEFAULT \
|
||
|
|
--
|
||
|
|
1.8.5.2
|
||
|
|
|