diff options
Diffstat (limited to 'recipes/ion/ion3/201_fix-paths.diff')
| -rw-r--r-- | recipes/ion/ion3/201_fix-paths.diff | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/recipes/ion/ion3/201_fix-paths.diff b/recipes/ion/ion3/201_fix-paths.diff new file mode 100644 index 0000000000..014e6671e9 --- /dev/null +++ b/recipes/ion/ion3/201_fix-paths.diff @@ -0,0 +1,93 @@ +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- ion-3ds-20041104/system.mk~201fix-paths ++++ ion-3ds-20041104/system.mk +@@ -7,7 +7,7 @@ + ## Installation paths + ## + +-PREFIX=/usr/local ++PREFIX=/usr + + # Unless you are creating a package conforming to some OS's standards, you + # probably do not want to modify the following directories: +@@ -15,7 +15,7 @@ + # Main binaries + BINDIR=$(PREFIX)/bin + # Configuration .lua files +-ETCDIR=$(PREFIX)/etc/ion3 ++ETCDIR=/etc/X11/ion3 + # Some .lua files and ion-* shell scripts + SHAREDIR=$(PREFIX)/share/ion3 + # Manual pages +@@ -27,11 +27,11 @@ + # Nothing at the moment + LIBDIR=$(PREFIX)/lib + # Modules +-MODULEDIR=$(LIBDIR)/ion3/mod ++MODULEDIR=$(LIBDIR)/ion3 + # Compiled Lua source code + LCDIR=$(LIBDIR)/ion3/lc + # ion-completefile (does not belong in SHAREDIR being a binary file) +-EXTRABINDIR=$(LIBDIR)/ion3/bin ++EXTRABINDIR=$(LIBDIR)/ion3 + # For ion-completeman system-wide cache + VARDIR=/var/cache/ion3 + # Message catalogs +@@ -56,18 +56,18 @@ + + # If you have installed Lua 5.0 from the official tarball without changing + # paths, this should do it. +-LUA_DIR=/usr/local +-LUA_LIBS = -L$(LUA_DIR)/lib -llua -llualib +-LUA_INCLUDES = -I$(LUA_DIR)/include +-LUA=$(LUA_DIR)/bin/lua +-LUAC=$(LUA_DIR)/bin/luac ++#LUA_DIR=/usr/local ++#LUA_LIBS = -L$(LUA_DIR)/lib -llua -llualib ++#LUA_INCLUDES = -I$(LUA_DIR)/include ++#LUA=$(LUA_DIR)/bin/lua ++#LUAC=$(LUA_DIR)/bin/luac + + # If you are using the Debian packages, the following settings should be + # what you want. +-#LUA_LIBS=`lua-config50 --libs` +-#LUA_INCLUDES=`lua-config50 --include` +-#LUA=lua50 +-#LUAC=luac50 ++LUA_LIBS=`lua-config --libs` ++LUA_INCLUDES=`lua-config --include` ++LUA=lua ++LUAC=luac + + + ## +@@ -107,7 +107,7 @@ + # asprintf and vasprintf in the c library. (gnu libc has.) + # If HAS_SYSTEM_ASPRINTF is not defined, an implementation + # in sprintf_2.2/ is used. +-#HAS_SYSTEM_ASPRINTF=1 ++HAS_SYSTEM_ASPRINTF=1 + + + # If you're on an archaic system (such as relatively recent *BSD releases) +@@ -139,14 +139,14 @@ + + #C89_SOURCE=-ansi + +-#POSIX_SOURCE=-D_POSIX_SOURCE ++POSIX_SOURCE=-D_POSIX_SOURCE + + # Most systems +-#XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED ++XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED + # SunOS, (Irix) + #XOPEN_SOURCE=-D__EXTENSIONS__ + +-#C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY ++C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY + + # The -DCF_HAS_VA_COPY option should allow for some optimisations, and + # in some cases simply defining |