summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaca <taca>2010-08-31 16:28:13 +0000
committertaca <taca>2010-08-31 16:28:13 +0000
commit8006b94b88d66ea86d927e7e2c1c922c6b5b23e2 (patch)
tree2deca5b4aa7cc9beee80d34f8601b3556c15eda0
parent72ee1d403b4e6bc45b33b03f2f6ec583411d8eb9 (diff)
downloadpkgsrc-8006b94b88d66ea86d927e7e2c1c922c6b5b23e2.tar.gz
Explicitly set environment INSTALL, and reset INSTALL_DATA,
INSTALL_PROGRAM and INSTALL_SCRIPT. They reflect to Ruby's Config::CONFIG constant which contains various configuration parametes which would be used when installing extention modules including ruby gems. Setting INSTALL explicitly reset the line in mk/configure/gnu-configure.mk. CONFIGURE_ENV+= ac_given_INSTALL=${INSTALL:Q}\ -c\ -o\ ${BINOWN}\ -g\ ${BINGRP} Should be fix PR pkg/43684 and pkg/43687. Bump PKGREVISION.
-rw-r--r--lang/ruby18-base/Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index d2f3dade080..04229a3b8fe 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.56 2010/08/16 07:08:12 taca Exp $
+# $NetBSD: Makefile,v 1.57 2010/08/31 16:28:13 taca Exp $
#
DISTNAME= ${RUBY_DISTNAME}
PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
CATEGORIES= lang ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
-PKGREVISION= 6
+PKGREVISION= 7
MAINTAINER= taca@NetBSD.org
HOMEPAGE= ${RUBY_HOMEPAGE}
@@ -28,9 +28,15 @@ TEST_TARGET= test
CONFIGURE_ARGS+= --enable-shared \
--with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \
--with-ssl-lib="${BUILDLINK_PREFIX.openssl}/lib"
-CONFIGURE_ENV+= PREFIX=${PREFIX}
WRKSRC= ${RUBY_WRKSRC}
+#
+# Don't refrect pkgsrc's INSTALL macro since Ruby expect it could
+# execute by unprivileged user.
+#
+CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \
+ INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT=
+
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Msunpro)