From 292e4606216f45a79b28430c853ba97dc51d1d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?agentzh=20=28=E7=AB=A0=E4=BA=A6=E6=98=A5=29?= Date: Wed, 9 Mar 2011 21:01:41 +0800 Subject: [PATCH] now we apply the makefile install fix patch for Solaris. --- patches/lua-5.1.4-makefile_install_fix.patch | 23 ++++++++++++++++++++ util/configure | 1 + util/mirror-tarballs | 6 +++++ 3 files changed, 30 insertions(+) create mode 100644 patches/lua-5.1.4-makefile_install_fix.patch diff --git a/patches/lua-5.1.4-makefile_install_fix.patch b/patches/lua-5.1.4-makefile_install_fix.patch new file mode 100644 index 0000000..6f90e6f --- /dev/null +++ b/patches/lua-5.1.4-makefile_install_fix.patch @@ -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 diff --git a/util/configure b/util/configure index c4e0044..444a616 100755 --- a/util/configure +++ b/util/configure @@ -378,6 +378,7 @@ sub build_resty_opts { env LUA_INC => "$lua_root$lua_prefix/include"; push @make_cmds, "cd build/$lua_src && \$(MAKE) $platform"; + push @make_install_cmds, "cd build/$lua_src && " . "\$(MAKE) install INSTALL_TOP=\$(DESTDIR)$lua_prefix"; diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 01061b7..dc12919 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -161,6 +161,12 @@ cd ../.. || 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