Browse Source

- lua: fix structure in .remove directory; fix directories in lua.pc file

master
vanhofen 6 years ago
parent
commit
42cdfa5724
  1. 5
      make/target-lua.mk
  2. 13
      patches/lua-01-remove-man.patch

5
make/target-lua.mk

@ -14,7 +14,6 @@ $(ARCHIVE)/$(LUA_SOURCE):
LUA_PATCH = lua-01-fix-LUA_ROOT.patch
LUA_PATCH += lua-01-remove-readline.patch
LUA_PATCH += lua-01-remove-man.patch
LUA_PATCH += lua-02-shared-libs-for-lua.patch
LUA_PATCH += lua-03-lua-pc.patch
LUA_PATCH += lua-04-crashfix.diff
@ -30,8 +29,8 @@ $(D)/lua: $(D)/ncurses $(ARCHIVE)/$(LUA_SOURCE) | $(TARGET_DIR)
AR="$(TARGET_AR) rcu" \
LDFLAGS="$(TARGET_LDFLAGS)" \
; \
$(MAKE) install INSTALL_TOP=$(TARGET_DIR); \
$(MAKE) pc > $(PKG_CONFIG_PATH)/lua.pc
$(MAKE) install INSTALL_TOP=$(TARGET_DIR) INSTALL_MAN=$(TARGET_DIR)$(remove-man1dir); \
$(MAKE) pc INSTALL_TOP=$(TARGET_DIR) > $(PKG_CONFIG_PATH)/lua.pc
$(REWRITE_PKGCONF)/lua.pc
rm -rf $(TARGET_DIR)/bin/luac
$(REMOVE)/$(LUA_TMP)

13
patches/lua-01-remove-man.patch

@ -1,13 +0,0 @@
diff --git a/Makefile b/Makefile
index d2c7db4..2dea130 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ INSTALL_TOP= /usr/local
INSTALL_BIN= $(INSTALL_TOP)/bin
INSTALL_INC= $(INSTALL_TOP)/include
INSTALL_LIB= $(INSTALL_TOP)/lib
-INSTALL_MAN= $(INSTALL_TOP)/man/man1
+INSTALL_MAN= $(INSTALL_TOP)/.remove
INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
Loading…
Cancel
Save