diff options
| author | taca <taca@pkgsrc.org> | 2020-12-19 14:41:16 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2020-12-19 14:41:16 +0000 |
| commit | 4cda83671ae25f10a7e4f6178b2f441851f4e29c (patch) | |
| tree | 7191212cfd34b9975d26c1829818fc63404959bc /lang/ruby | |
| parent | 9fa96a885f6e08852cd52a5322d53f6f8ffd1f9a (diff) | |
| download | pkgsrc-4cda83671ae25f10a7e4f6178b2f441851f4e29c.tar.gz | |
lang/ruby: try removing extra directory
Try removing extra directory and make "make print-PLIST" happy a little.
Diffstat (limited to 'lang/ruby')
| -rw-r--r-- | lang/ruby/gem-vars.mk | 8 | ||||
| -rw-r--r-- | lang/ruby/gem.mk | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lang/ruby/gem-vars.mk b/lang/ruby/gem-vars.mk index 33f08e6ca04..e589fb99125 100644 --- a/lang/ruby/gem-vars.mk +++ b/lang/ruby/gem-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: gem-vars.mk,v 1.9 2019/11/03 19:04:06 rillig Exp $ +# $NetBSD: gem-vars.mk,v 1.10 2020/12/19 14:41:16 taca Exp $ # # This Makefile fragment defines various make(1) variables for Ruby gems # support. @@ -22,10 +22,12 @@ GEM_EXTSDIR_NEEDS_SUBDIR?= yes .if exists(${RUBYGEM}) RUBY_GEM_ARCH!= ${RUBYGEM} environment platform | ${SED} -e 's|.*:||' +GEM_EXTSBASE= ${GEM_HOME}/extensions + . if !empty(GEM_EXTSDIR_NEEDS_SUBDIR:M[nN][oO]) -GEM_EXTSDIR= ${GEM_HOME}/extensions/${RUBY_GEM_ARCH}/${RUBY_VER_DIR} +GEM_EXTSDIR= ${GEM_EXTSBASE}/${RUBY_GEM_ARCH}/${RUBY_VER_DIR} . else -GEM_EXTSDIR= ${GEM_HOME}/extensions/${RUBY_GEM_ARCH}/${RUBY_VER_DIR}/${GEM_NAME} +GEM_EXTSDIR= ${GEM_EXTSBASE}/${RUBY_GEM_ARCH}/${RUBY_VER_DIR}/${GEM_NAME} . endif . if !empty(GEM_EXTSDIR) diff --git a/lang/ruby/gem.mk b/lang/ruby/gem.mk index 7f8ef4cd276..a3e679b9f6c 100644 --- a/lang/ruby/gem.mk +++ b/lang/ruby/gem.mk @@ -1,4 +1,4 @@ -# $NetBSD: gem.mk,v 1.42 2020/05/02 17:03:11 taca Exp $ +# $NetBSD: gem.mk,v 1.43 2020/12/19 14:41:16 taca Exp $ # # This Makefile fragment is intended to be included by packages that build # and install Ruby gems. @@ -326,6 +326,9 @@ _gem-build-cleanbuild: fi; \ done . endif + @${RMDIR} ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_BUILDINFO_DIR} \ + ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_EXTSBASE} \ + >/dev/null 2>&1 || true . if !empty(GEM_EXTSDIR) && !empty(GEM_CLEANBUILD_EXTENSIONS) ${RUN} \ if test ! -d ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_EXTSDIR}; then \ |