From 9c7833b3890910322c378d61a77aa95ac33f13f1 Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh Date: Mon, 1 Nov 2021 21:30:26 +0800 Subject: [PATCH] lang/ruby27: Use proper variables, RUBY_SHLIBVER and RUBY_SUFFIX --- lang/ruby27/Makefile | 2 +- lang/ruby27/pkg-plist | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/ruby27/Makefile b/lang/ruby27/Makefile index 958018f91f766..9bb23502ef613 100644 --- a/lang/ruby27/Makefile +++ b/lang/ruby27/Makefile @@ -113,7 +113,7 @@ MAKE_JOBS_UNSAFE= yes .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} PLIST_SUB+= IF_DEFAULT="" .else -PKGNAMESUFFIX= ${RUBY_VER:C/\.//} +PKGNAMESUFFIX= ${RUBY_SUFFIX} PLIST_SUB+= IF_DEFAULT="@comment " .endif diff --git a/lang/ruby27/pkg-plist b/lang/ruby27/pkg-plist index 0c19c44cf329b..e7f1bf54f25a3 100644 --- a/lang/ruby27/pkg-plist +++ b/lang/ruby27/pkg-plist @@ -32,9 +32,9 @@ include/ruby-%%RUBY_VER%%/ruby/thread_native.h include/ruby-%%RUBY_VER%%/ruby/util.h include/ruby-%%RUBY_VER%%/ruby/version.h include/ruby-%%RUBY_VER%%/ruby/vm.h -lib/lib%%RUBY_NAME%%-static.a -lib/lib%%RUBY_NAME%%.so -lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% +lib/libruby%%RUBY_SHLIBVER%%-static.a +lib/libruby%%RUBY_SHLIBVER%%.so +lib/libruby%%RUBY_SHLIBVER%%.so.%%RUBY_SHLIBVER%% %%RUBY_LIBDIR%%/English.rb %%RUBY_LIBDIR%%/abbrev.rb %%RUBY_ARCHLIBDIR%%/bigdecimal.so