summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2018-01-25 02:47:01 +0000
committerYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2018-01-25 02:47:01 +0000
commitb97c00f56d451cf9712ff182c4ef453589331757 (patch)
tree68fdc8f7d82a5caf2fb92f0c801325fa4d624d88 /gnu/usr.bin
parentdfbd48319e3c4b5a987bee4a06831be82b69d8b0 (diff)
Fix perl build not to install libperl* twice. This has caused an
actual error if "install" was done parallelly. ok espie todd andrew1, input andrew1
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/perl/Makefile.bsd-wrapper123
1 files changed, 2 insertions, 21 deletions
diff --git a/gnu/usr.bin/perl/Makefile.bsd-wrapper1 b/gnu/usr.bin/perl/Makefile.bsd-wrapper1
index 61f464f72e9..35b89601c83 100644
--- a/gnu/usr.bin/perl/Makefile.bsd-wrapper1
+++ b/gnu/usr.bin/perl/Makefile.bsd-wrapper1
@@ -848,7 +848,7 @@ DynaLoader.c: miniperl ${DYNALOADER} lib/Config.pm
perl.lib: ${GENERATED} ${_LIBS}
-install: install.lib install.perl maninstall
+afterinstall: install.perl
-chmod -R a+rX ${DESTDIR}/usr/libdata/perl5
install.perl:
@@ -856,23 +856,4 @@ install.perl:
STRIPFLAGS=${STRIPFLAGS} INSTALLFLAGS=-o NOLIBINSTALL=1 \
LD_LIBRARY_PATH=${.OBJDIR} exec ./perl installperl --user=${LIBOWN} --group=${LIBGRP} --destdir=${DESTDIR} -o ${STRIPFLAGS}
-install.lib:
- ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 lib${LIB}.a \
- ${DESTDIR}${LIBDIR}
-.if (${INSTALL_COPY} != "-p")
- ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}.a
-.endif
- chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}.a
-.if !defined(NOPROFILE)
- ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \
- lib${LIB}_p.a ${DESTDIR}${LIBDIR}
-.if (${INSTALL_COPY} != "-p")
- ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
-.endif
- chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
-.endif
-.if !defined(NOPIC) && defined(major) && defined(minor)
- ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- lib${LIB}.so.${major}.${minor} ${DESTDIR}${LIBDIR}
-.endif
-.PHONY: perl.lib install.lib perl.build install.perl man.build
+.PHONY: perl.lib perl.build install.perl man.build