packages/dev-lua/luaexpat/files/luaexpat-1.2.0-paths.patch (1900B) - raw
1 diff -ur luaexpat-1.2.0.orig/config luaexpat-1.2.0/config
2 --- luaexpat-1.2.0.orig/config 2011-06-04 00:17:04.000000000 +1000
3 +++ luaexpat-1.2.0/config 2011-07-03 21:58:23.449064365 +1000
4 @@ -1,12 +1,8 @@
5 # Installation directories
6 # System's libraries directory (where binary libraries are installed)
7 -LUA_LIBDIR= /usr/local/lib/lua/5.0
8 +LUA_LIBDIR= /usr/lib/lua/5.1
9 # System's lua directory (where Lua libraries are installed)
10 -LUA_DIR= /usr/local/share/lua/5.0
11 +LUA_DIR= /usr/share/lua/5.1
12 -# Lua includes directory
13 -LUA_INC= /usr/local/include
14 -# Expat includes directory
15 -EXPAT_INC= /usr/local/include
16
17 # OS dependent
18 LIB_OPTION= -shared #for Linux
19 @@ -17,8 +13,7 @@
20 # (according to Lua 5.1 definition:
21 # first version digit * 100 + second version digit
22 # e.g. Lua 5.0.2 => 500, Lua 5.1 => 501, Lua 5.1.1 => 501)
23 -LUA_VERSION_NUM= 500
24 +LUA_VERSION_NUM= 501
25 -COMPAT_DIR= ../compat/src
26
27 # Compilation parameters
28 CWARNS = -Wall -pedantic \
29 @@ -31,6 +26,6 @@
30 -Wshadow \
31 -Wwrite-strings
32
33 -CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \
34 - -I$(COMPAT_DIR) -I$(EXPAT_INC)
35 +CFLAGS ?= -O2
36 +CFLAGS += $(CWARNS) -ansi -fPIC $(shell pkg-config --cflags lua)
37 -CC = gcc
38 +CC ?= gcc
39 diff -ur luaexpat-1.2.0.orig/makefile luaexpat-1.2.0/makefile
40 --- luaexpat-1.2.0.orig/makefile 2011-06-04 00:17:04.000000000 +1000
41 +++ luaexpat-1.2.0/makefile 2011-07-03 20:24:04.777166552 +1000
42 @@ -18,11 +18,11 @@
43 $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
44
45 install:
46 - mkdir -p $(LUA_LIBDIR)
47 + mkdir -p $(DESTDIR)$(LUA_LIBDIR)
48 - cp src/$(LIBNAME) $(LUA_LIBDIR)
49 + cp src/$(LIBNAME) $(DESTDIR)$(LUA_LIBDIR)
50 - cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
51 + cd $(DESTDIR)$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
52 - mkdir -p $(LUA_DIR)/$T
53 + mkdir -p $(DESTDIR)$(LUA_DIR)/$T
54 - cp src/$T/lom.lua $(LUA_DIR)/$T
55 + cp src/$T/lom.lua $(DESTDIR)$(LUA_DIR)/$T
56
57 clean:
58 rm -f src/$(LIBNAME) $(OBJS)