pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ruby Use GEM_EXTSDIR only if it isn't empty.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/15c6ab84aeb2
branches:  trunk
changeset: 631853:15c6ab84aeb2
user:      taca <taca%pkgsrc.org@localhost>
date:      Fri Mar 14 13:21:34 2014 +0000

description:
Use GEM_EXTSDIR only if it isn't empty.

diffstat:

 lang/ruby/gem.mk |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (47 lines):

diff -r f6e7cd1b6d41 -r 15c6ab84aeb2 lang/ruby/gem.mk
--- a/lang/ruby/gem.mk  Fri Mar 14 13:12:34 2014 +0000
+++ b/lang/ruby/gem.mk  Fri Mar 14 13:21:34 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gem.mk,v 1.27 2014/03/13 17:21:01 taca Exp $
+# $NetBSD: gem.mk,v 1.28 2014/03/14 13:21:34 taca Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install Ruby gems.
@@ -151,6 +151,12 @@
 USE_RAKE?=             YES
 .endif
 
+.if !empty(RUBY_GEMS_VERSION)
+.if ${_RUBYGEMS_MAJOR} >= 2 && ${_RUBYGEMS_MINORS} >= 2
+GEM_EXTSDIR=   ${GEM_HOME}/extensions/${RUBY_ARCH}/${RUBY_VERSION}/${GEM_NAME}
+.endif
+.endif
+
 # print-PLIST support
 PRINT_PLIST_AWK+=      /${GEM_NAME}\.info$$/ \
                        { gsub(/${GEM_NAME}\.info/, "$${GEM_NAME}.info"); }
@@ -158,9 +164,11 @@
                        { gsub(/${GEM_NAME}\.gem/, "$${GEM_NAME}.gem"); }
 PRINT_PLIST_AWK+=      /${GEM_NAME:S/./[.]/g}[.](gem|gemspec)$$/ \
        { gsub(/${PKGVERSION_NOREV:S|/|\\/|g}[.]gem/, "$${PKGVERSION}.gem"); }
+.if !empty(GEM_EXTSDIR)
 PRINT_PLIST_AWK+=      /^${GEM_EXTSDIR:S|/|\\/|g}/ \
                { gsub(/${GEM_EXTSDIR:S|/|\\/|g}/, "$${GEM_EXTSDIR}"); \
                        print; next; }
+.endif
 PRINT_PLIST_AWK+=      /^${GEM_LIBDIR:S|/|\\/|g}/ \
        { gsub(/${GEM_LIBDIR:S|/|\\/|g}/, "$${GEM_LIBDIR}"); print; next; }
 PRINT_PLIST_AWK+=      /^${GEM_DOCDIR:S|/|\\/|g}/ \
@@ -241,12 +249,6 @@
 
 GEM_BUILDINFO_DIR=     ${GEM_HOME}/build_info
 
-.if !empty(RUBY_GEMS_VERSION)
-.if ${_RUBYGEMS_MAJOR} >= 2 && ${_RUBYGEMS_MINORS} >= 2
-GEM_EXTSDIR=   ${GEM_HOME}/extensions/${RUBY_ARCH}/${RUBY_VERSION}/${GEM_NAME}
-.endif
-.endif
-
 # Installed gems have wrapper scripts that call the right interpreter,
 # regardless of the #! line at the head of a script, so we can skip
 # the interpreter path check for gems.  ANd it is also true for files'



Home | Main Index | Thread Index | Old Index