From d90130614c5c0db4d2694597e5a1b10dd19086e0 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Fri, 5 Sep 2014 10:36:40 +0000 Subject: recognize install-wrapper as a valid install program --- usr.bin/libtool/LT/LaFile.pm | 4 ++-- usr.bin/libtool/LT/Mode/Install.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/libtool/LT/LaFile.pm b/usr.bin/libtool/LT/LaFile.pm index 641cb650c74..bd29cc34493 100644 --- a/usr.bin/libtool/LT/LaFile.pm +++ b/usr.bin/libtool/LT/LaFile.pm @@ -1,4 +1,4 @@ -# $OpenBSD: LaFile.pm,v 1.22 2014/04/27 18:08:35 zhuk Exp $ +# $OpenBSD: LaFile.pm,v 1.23 2014/09/05 10:36:39 espie Exp $ # Copyright (c) 2007-2010 Steven Mestdagh # Copyright (c) 2012 Marc Espie @@ -149,7 +149,7 @@ sub install my @opts = @$instopts; my @stripopts = ('--strip-debug'); - if ($$instprog[-1] =~ m/install([.-](sh|check))?$/) { + if ($$instprog[-1] =~ m/install([.-](sh|check|wrapper))?$/) { push @opts, '-m', '644'; } diff --git a/usr.bin/libtool/LT/Mode/Install.pm b/usr.bin/libtool/LT/Mode/Install.pm index 215d30379a1..6c252a79047 100644 --- a/usr.bin/libtool/LT/Mode/Install.pm +++ b/usr.bin/libtool/LT/Mode/Install.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Install.pm,v 1.7 2014/03/19 02:16:22 afresh1 Exp $ +# $OpenBSD: Install.pm,v 1.8 2014/09/05 10:36:39 espie Exp $ # # Copyright (c) 2007-2010 Steven Mestdagh # Copyright (c) 2012 Marc Espie @@ -42,7 +42,7 @@ sub run my @argvcopy = @ARGV; my %install_opts; tsay {"ltprog[-1] = $$ltprog[-1]"}; - if ($$ltprog[-1] =~ m/install([.-](sh|check))?$/) { + if ($$ltprog[-1] =~ m/install([.-](sh|check|wrapper))?$/) { getopts('BbCcdf:g:m:o:pSs', \%install_opts); if (@ARGV < 2 && (!defined $install_opts{'d'} && @ARGV == 1)) { die "Wrong number of arguments for install\n"; -- cgit v1.2.3