aboutsummaryrefslogtreecommitdiffstats
path: root/main/rrdtool/dont-install-in-usr-local.patch
blob: da6338138608c3feb947d93ec4833373f3547858 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39

abuild/postcheck() complains about not putting files in /usr/local

---
 bindings/lua/compat-5.1r5/compat-5.1.lua | 4 ++--
 configure.ac                             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bindings/lua/compat-5.1r5/compat-5.1.lua b/bindings/lua/compat-5.1r5/compat-5.1.lua
index b662270..0179122 100644
--- a/bindings/lua/compat-5.1r5/compat-5.1.lua
+++ b/bindings/lua/compat-5.1r5/compat-5.1.lua
@@ -52,8 +52,8 @@ package.path = LUA_PATH or os.getenv("LUA_PATH") or
 package.cpath = LUA_CPATH or os.getenv("LUA_CPATH") or
              "./?.so;" ..
              "./l?.so;" ..
-             "/usr/local/lib/lua/5.0/?.so;" ..
-             "/usr/local/lib/lua/5.0/l?.so"
+             "/usr/lib/lua/5.0/?.so;" ..
+             "/usr/lib/lua/5.0/l?.so"
 
 --
 -- make sure require works with standard libraries
diff --git a/configure.ac b/configure.ac
index 5270b22..8d87da9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -864,7 +864,7 @@ LUA_EOF
           AC_MSG_WARN(Setting Lua include and lib flags to defaults in compat-5.1 and lua 5.1 sources)
           LUA_CFLAGS="-I/usr/local/include -I/usr/local/include/lua -I/usr/local/include/lua/$lua_vdot"
           LUA_LFLAGS="-L/usr/local/lib -L/usr/local/lib/lua -L/usr/local/lib/lua/$lua_vdot $lua_libs"
-          LUA_INSTALL_CMOD="/usr/local/lib/lua/$lua_vdot"
+          LUA_INSTALL_CMOD="/usr/lib/lua/$lua_vdot"
         fi
 
         dnl pass additional lua options
-- 
2.11.1