now we apply the makefile install fix patch for Solaris.

This commit is contained in:
agentzh (章亦春) 2011-03-09 21:01:41 +08:00
parent c8505d3a36
commit 292e460621
3 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,23 @@
--- lua-5.1.4/Makefile 2008-08-12 08:40:48.000000000 +0800
+++ lua-5.1.4-patched/Makefile 2011-03-09 20:56:47.603422483 +0800
@@ -22,14 +22,14 @@
# How to install. If your install program does not support "-p", then you
# may have to run ranlib on the installed liblua.a (do "make ranlib").
-INSTALL= install -p
-INSTALL_EXEC= $(INSTALL) -m 0755
-INSTALL_DATA= $(INSTALL) -m 0644
+#INSTALL= install -p
+#INSTALL_EXEC= $(INSTALL) -m 0755
+#INSTALL_DATA= $(INSTALL) -m 0644
#
# If you don't have install you can use cp instead.
-# INSTALL= cp -p
-# INSTALL_EXEC= $(INSTALL)
-# INSTALL_DATA= $(INSTALL)
+INSTALL= cp -p
+INSTALL_EXEC= $(INSTALL)
+INSTALL_DATA= $(INSTALL)
# Utilities.
MKDIR= mkdir -p

1
util/configure vendored
View File

@ -378,6 +378,7 @@ sub build_resty_opts {
env LUA_INC => "$lua_root$lua_prefix/include"; env LUA_INC => "$lua_root$lua_prefix/include";
push @make_cmds, "cd build/$lua_src && \$(MAKE) $platform"; push @make_cmds, "cd build/$lua_src && \$(MAKE) $platform";
push @make_install_cmds, "cd build/$lua_src && " push @make_install_cmds, "cd build/$lua_src && "
. "\$(MAKE) install INSTALL_TOP=\$(DESTDIR)$lua_prefix"; . "\$(MAKE) install INSTALL_TOP=\$(DESTDIR)$lua_prefix";

View File

@ -161,6 +161,12 @@ cd ../.. || exit 1
rm "patch-lua-$ver-2" || exit 1 rm "patch-lua-$ver-2" || exit 1
cp $root/patches/lua-$ver-makefile_install_fix.patch lua-makefile-fix.patch || exit 1
patch -p0 < lua-makefile-fix.patch || exit 1
rm lua-makefile-fix.patch
################################# #################################
ver=2.0.0-beta6 ver=2.0.0-beta6