do not use lua-NOT-5.1 include files

master
Y 2017-05-27 17:10:44 +02:00
parent 9ce9c645cd
commit 2b3d014a1a
3 changed files with 14 additions and 8 deletions

View File

@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
# Sat May 27 12:22:31 UTC 2017
# Sat May 27 15:09:54 UTC 2017
pkgbase = lua51-lpty
pkgdesc = pty control for lua 5.1
pkgver = 1.2.1
pkgrel = 1
pkgrel = 2
url = http://tset.de/lpty/index.html
arch = i686
arch = x86_64
@ -12,7 +12,7 @@ pkgbase = lua51-lpty
source = http://tset.de/downloads/lpty-1.2.1-1.tar.gz
source = Makefile.patch
sha1sums = 56e7679565a5a0bf94371e9ef33a7e3a9a1a7ba5
sha1sums = 260122987581be795299cb8f3afff22f79094af0
sha1sums = c7d86d854d05d4a941a8a68ffbd59ea4a519ecd3
pkgname = lua51-lpty

View File

@ -1,5 +1,5 @@
--- Makefile.dist 2016-07-18 15:28:52.000000000 +0200
+++ Makefile 2017-05-27 13:56:10.325084225 +0200
+++ Makefile 2017-05-27 17:06:44.630971965 +0200
@@ -5,8 +5,9 @@
# try some automatic discovery
@ -12,15 +12,21 @@
LUAROOT = $(shell dirname $(LUA_BINDIR))
# Defaults
@@ -17,7 +18,6 @@
@@ -15,9 +16,12 @@
CC = gcc
CFLAGS = -fPIC -Wall $(DEBUG)
+ifeq ($(LUA),lua)
LUA_INCDIR = $(LUAROOT)/include
+else
+LUA_INCDIR = $(LUAROOT)/include/lua$(LUAVERSION)
+endif
LUA_LIBDIR = $(LUAROOT)/lib
-LUA = lua
# OS specialities
ifeq ($(OS),Darwin)
@@ -47,7 +47,7 @@
@@ -47,7 +51,7 @@
cp $(TARGET) $(INST_LIBDIR)
test: all

View File

@ -3,7 +3,7 @@
pkgname=lua51-lpty
pkgver=1.2.1
_upstream_rel=1
pkgrel=1
pkgrel=2
pkgdesc="pty control for lua 5.1"
arch=('i686' 'x86_64')
url="http://tset.de/lpty/index.html"
@ -12,7 +12,7 @@ depends=('lua51')
source=("http://tset.de/downloads/lpty-${pkgver}-${_upstream_rel}.tar.gz"
"Makefile.patch")
sha1sums=('56e7679565a5a0bf94371e9ef33a7e3a9a1a7ba5'
'260122987581be795299cb8f3afff22f79094af0')
'c7d86d854d05d4a941a8a68ffbd59ea4a519ecd3')
prepare() {
cd "${srcdir}/lpty-${pkgver}-${_upstream_rel}"