Pass in INSTALL_{DATA,LIB} to make rather than hardcoding path of install.

Fixes install on Arch Linux.
This commit is contained in:
markd 2011-01-18 10:34:38 +00:00
parent ebaccc700a
commit d6f8bfde5c
3 changed files with 20 additions and 4 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2010/01/24 17:11:19 heinz Exp $
# $NetBSD: Makefile,v 1.8 2011/01/18 10:34:38 markd Exp $
#
DISTNAME= libvolume_id-0.81.1
@ -17,4 +17,7 @@ USE_TOOLS+= gmake pkg-config
USE_LIBTOOL=yes
MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q}
MAKE_ENV+= INSTALL_LIB=${INSTALL_LIB:Q}
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.6 2009/05/03 21:35:38 wiz Exp $
$NetBSD: distinfo,v 1.7 2011/01/18 10:34:38 markd Exp $
SHA1 (libvolume_id-0.81.1.tar.bz2) = 3d2f22654042e5995d119d61d2aecf4b5d8efb8a
RMD160 (libvolume_id-0.81.1.tar.bz2) = 222fbe2ff595eeedafe41c9c47987ead34aa455e
@ -7,4 +7,4 @@ SHA1 (patch-aa) = f1bc3a47df3d98bba4b08e96f957e11f56155c18
SHA1 (patch-ab) = f9f80eeeb67b8f8babf777bf59226249b03576b8
SHA1 (patch-ac) = d99ce65248e2520f107081b8474225ab1449d72e
SHA1 (patch-ad) = c09ecb39f154c37e72dfb6bb6241ec33d77c0b60
SHA1 (patch-ae) = 82d0bdd10818ed75eb1c555891c093eddbffaa7a
SHA1 (patch-ae) = 9382586dab03ed7691d26b029d930940dc3e7302

View file

@ -1,7 +1,20 @@
$NetBSD: patch-ae,v 1.1 2009/01/04 23:10:06 dbj Exp $
$NetBSD: patch-ae,v 1.2 2011/01/18 10:34:39 markd Exp $
--- Makefile.orig 2007-12-26 16:52:36.000000000 -0800
+++ Makefile 2009-01-04 15:05:52.000000000 -0800
@@ -8,9 +8,9 @@ includedir = ${prefix}/include
libdir = ${prefix}/lib
usrlibdir = ${prefix}/lib
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_LIB = ${INSTALL} -m 755
+#INSTALL = /usr/bin/install -c
+#INSTALL_DATA = ${INSTALL} -m 644
+#INSTALL_LIB = ${INSTALL} -m 755
SHLIB_CUR = 0
SHLIB_REV = 81
@@ -59,12 +59,19 @@ HEADERS= \
libvolume_id.h \
util.h