diff -up src/ion-3-20090110/system.mk.orig src/ion-3-20090110/system.mk --- src/ion-3-20090110/system.mk.orig 2009-01-09 15:20:27.000000000 -0700 +++ src/ion-3-20090110/system.mk 2015-07-15 05:00:19.000000000 -0600 @@ -8,7 +8,7 @@ # Installation path prefix. Unless you know what you're doing, the default # of /usr/local is likely the correct choice. -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: @@ -16,7 +16,7 @@ PREFIX=/usr/local # Main binaries BINDIR=$(PREFIX)/bin # Configuration .lua files -ETCDIR=$(PREFIX)/etc/ion3 +ETCDIR=/etc/ion3 # Some .lua files and ion-* shell scripts SHAREDIR=$(PREFIX)/share/ion3 # Manual pages @@ -62,18 +62,18 @@ DL_LIBS=-ldl # If you have installed Lua 5.1 from the official tarball without changing # paths, this should do it. -LUA_DIR=/usr/local -LUA_LIBS = -L$(LUA_DIR)/lib -llua -LUA_INCLUDES = -I$(LUA_DIR)/include -LUA=$(LUA_DIR)/bin/lua -LUAC=$(LUA_DIR)/bin/luac +LUA_DIR=/usr +#LUA_LIBS = -L$(LUA_DIR)/lib -llua +#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=`pkg-config --libs lua5.1` -#LUA_INCLUDES=`pkg-config --cflags lua5.1` -#LUA=/usr/bin/lua5.1 -#LUAC=/usr/bin/luac5.1 +LUA_LIBS=`pkg-config --libs lua51` +LUA_INCLUDES=`pkg-config --cflags lua51` +LUA=/usr/bin/lua5.1 +LUAC=/usr/bin/luac5.1 ## @@ -127,7 +127,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR # You may uncomment this if you know that your system C libary provides # asprintf and vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not # defined, an implementation provided in libtu/sprintf_2.2/ is used. -#HAS_SYSTEM_ASPRINTF=1 +HAS_SYSTEM_ASPRINTF=1 # The following setting is needed with GNU libc for clock_gettime and the # monotonic clock. Other systems may not need it, or may not provide a @@ -207,7 +207,7 @@ RANLIB=ranlib ## Install & strip ## -INSTALL=sh $(TOPDIR)/install-sh -c +INSTALL=install INSTALL_STRIP=-s INSTALLDIR=mkdir -p