From 3c2739e4937930ed830045bd19401d49b4346a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Tue, 4 Feb 2020 13:40:29 +0100 Subject: Revert "subr/pkg_{build,install_make}.subr: default to LIBTOOL=rdlibtool (via midipix.)" This reverts commit fde9ee5a1385d14a8bd82ae548f1d7c1e1de551a. --- subr/pkg_build.subr | 2 +- subr/pkg_install_make.subr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'subr') diff --git a/subr/pkg_build.subr b/subr/pkg_build.subr index f3a41441..4c1b41eb 100644 --- a/subr/pkg_build.subr +++ b/subr/pkg_build.subr @@ -22,7 +22,7 @@ pkg_build() { "${PKG_PKGCONFIG:+PKGCONFIG=${PKG_PKGCONFIG}}" \ "${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}" \ "${PKG_PKG_CONFIG_LIBPATH:+PKG_CONFIG_LIBPATH=${PKG_PKG_CONFIG_LIBPATH}}"\ - "LIBTOOL=${PKG_LIBTOOL:-rdlibtool}"; + "LIBTOOL=${PKG_LIBTOOL:-slibtool}"; }; # vim:filetype=sh diff --git a/subr/pkg_install_make.subr b/subr/pkg_install_make.subr index d34e83e9..48489c53 100644 --- a/subr/pkg_install_make.subr +++ b/subr/pkg_install_make.subr @@ -12,7 +12,7 @@ pkg_install_make() { "${PKG_LDFLAGS_INSTALL:+LDFLAGS=${PKG_LDFLAGS_INSTALL}}" \ "${PKG_LDFLAGS_INSTALL_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_INSTALL_EXTRA}}" \ "${PKG_RANLIB_INSTALL:+RANLIB=${PKG_RANLIB_INSTALL}}" \ - "LIBTOOL=${PKG_LIBTOOL:-rdlibtool}" \ + "LIBTOOL=${PKG_LIBTOOL:-slibtool}" \ "${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/" \ ${PKG_INSTALL_TARGET:=install}; }; -- cgit v1.2.3