diff options
| author | kstailey <kstailey@cvs.openbsd.org> | 1997-07-24 21:12:16 +0000 |
|---|---|---|
| committer | kstailey <kstailey@cvs.openbsd.org> | 1997-07-24 21:12:16 +0000 |
| commit | 0de12a66a36dcbdd9340bc586acf3de1a3a76013 (patch) | |
| tree | fa42c838ab97e53c7849369043124c3cc3cf3ce4 /gnu | |
| parent | f8beadbe4e325f8178acbe9b2240bb6113f7ce0f (diff) | |
respect ``INSTALL_STRIP=-s'' pr 188
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/perl/Makefile.bsd-wrapper | 13 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/installperl | 9 |
2 files changed, 17 insertions, 5 deletions
diff --git a/gnu/usr.bin/perl/Makefile.bsd-wrapper b/gnu/usr.bin/perl/Makefile.bsd-wrapper index 4627f8ac0b7..689807ed3cd 100644 --- a/gnu/usr.bin/perl/Makefile.bsd-wrapper +++ b/gnu/usr.bin/perl/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.11 1997/06/23 22:41:28 kstailey Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.12 1997/07/24 21:12:14 kstailey Exp $ # # Build wrapper for Perl 5.003. # @@ -21,6 +21,8 @@ MAN= x2p/a2p.man x2p/s2p.man pod/perl.man pod/perlbook.man \ pod/perltie.man pod/perltoc.man pod/perltrap.man \ pod/perlvar.man pod/perlxs.man pod/perlxstut.man +.include <bsd.own.mk> + .ifndef NOMAN MANALL= ${MAN:S/.man$/.cat1/g} .else @@ -29,6 +31,12 @@ MANALL= MANLOCALBUILD= yes +.if defined (INSTALL_STRIP) && ${INSTALL_STRIP} == "-s" +INST_PROG='/usr/bin/install -cs' +.else +INST_PROG='/usr/bin/install -c' +.endif + .SUFFIXES: .man .cat1 .man.cat1: @@ -86,7 +94,8 @@ maninstall: .endif install: ${MANALL} maninstall - (cd ${.OBJDIR}; ${MAKE} install) + (cd ${.OBJDIR}; INSTALL=${INSTALL} INSTALL_COPY=${INSTALL_COPY} \ + INSTALL_STRIP=${INSTALL_STRIP} ${MAKE} install) (cd ${DESTDIR}/usr/include; ${H2PH} *.h arpa/*.h machine/*.h net/*.h \ protocols/*.h sys/*.h) -chmod -R a+rX ${DESTDIR}/usr/lib/perl5 diff --git a/gnu/usr.bin/perl/installperl b/gnu/usr.bin/perl/installperl index 14412b4e032..0626c8ff2d1 100644 --- a/gnu/usr.bin/perl/installperl +++ b/gnu/usr.bin/perl/installperl @@ -1,7 +1,7 @@ #!./perl -# $OpenBSD: installperl,v 1.3 1996/08/26 14:06:20 downsj Exp $ +# $OpenBSD: installperl,v 1.4 1996/09/06 17:35:29 downsj Exp $ # -# This is hacked up, in order to support DESTDIR. +# This is hacked up, in order to support DESTDIR and INSTALL_STRIP. # BEGIN { @INC=('./lib', '../lib') } @@ -123,8 +123,11 @@ if (! &samepath($installbin, '.')) { } if (! &samepath($installbin, 'x2p')) { + $installcmd = $ENV{"INSTALL"} + . " " . $ENV{"INSTALL_COPY"} + . " " . $ENV{"INSTALL_STRIP"}; &safe_unlink("$installbin/a2p$exe_ext"); - &cmd("cp x2p/a2p$exe_ext $installbin/a2p$exe_ext"); + &cmd("$installcmd x2p/a2p$exe_ext $installbin"); &chmod(0755, "$installbin/a2p$exe_ext"); } |