Nice set of fixes to use SCRIPT instead of PROG, thus fixing up

a lot of nasty STRIP= problems. This has the added side effect
if neatening up some leaf makefiles very nicely.

Submitted by:	ru
This commit is contained in:
Mark Murray 2002-02-10 19:48:19 +00:00
parent b3b414b604
commit 535cc97895
19 changed files with 73 additions and 93 deletions

View File

@ -2,13 +2,27 @@
# $FreeBSD$
#
PERL5SRC?= ${.CURDIR}/../../../../../contrib/perl5
MINIPERLOPT?= -I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
CLEANFILES+= ${PROG}.1 ${PROG}.PL
.ORDER: ${PROG}.PL ${PROG} ${PROG}.1 ${PROG}.1.gz
STRIP=
PERL5SRC= ${.CURDIR}/../../../../../contrib/perl5
PERL5LIBSRC= ${.CURDIR}/../../libperl
.include "../Makefile.inc"
MINIPERLOPT?= -I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
.if defined(SCRIPTS)
.if !defined(NOMAN)
MAN= ${SCRIPTS}.1
.endif
${SCRIPTS}: ${SCRIPTS}.PL
${MINIPERL} ${MINIPERLOPT} ${.ALLSRC}
${SCRIPTS}.1: ${SCRIPTS}.PL
${MINIPERL} ${MINIPERLOPT} \
${.OBJDIR}/../pod2man/pod2man ${.ALLSRC} > ${.TARGET}
${SCRIPTS}.PL: ${PERL5SRC}/pod/${SCRIPTS}.PL
ln -sf ${.ALLSRC} ${.TARGET}
CLEANFILES+= ${SCRIPTS} ${SCRIPTS}.1 ${SCRIPTS}.PL
.endif

View File

@ -2,15 +2,6 @@
# $FreeBSD$
#
PROG= pod2html
${PROG}: ${PROG}.PL
${MINIPERL} ${MINIPERLOPT} ${PROG}.PL
${PROG}.1: ${PROG}.PL
${MINIPERL} ${MINIPERLOPT} ${.OBJDIR}/../pod2man/pod2man ${PROG}.PL > ${PROG}.1
SCRIPTS=pod2html
.include <bsd.prog.mk>
${PROG}.PL: ${PERL5SRC}/pod/${PROG}.PL
cp -p ${.OODATE} ${.TARGET}

View File

@ -2,14 +2,7 @@
# $FreeBSD$
#
PROG= pod2latex
SCRIPTS=pod2latex
NOMAN= true
${PROG}: ${PROG}.PL
${MINIPERL} ${MINIPERLOPT} ${PROG}.PL
.include <bsd.prog.mk>
${PROG}.PL: ${PERL5SRC}/pod/${PROG}.PL
cp -p ${.OODATE} ${.TARGET}

View File

@ -2,16 +2,8 @@
# $FreeBSD$
#
PROG= pod2man
SCRIPTS=pod2man
${PROG}: ${PROG}.PL
${MINIPERL} ${MINIPERLOPT} ${PROG}.PL
${PROG}.1: ${PROG}.PL
${MINIPERL} ${MINIPERLOPT} ${.OBJDIR}/../pod2man/pod2man ${PROG}.PL \
> ${PROG}.1
.ORDER: pod2man pod2man.1
.include <bsd.prog.mk>
${PROG}.PL: ${PERL5SRC}/pod/${PROG}.PL
cp -p ${.OODATE} ${.TARGET}

View File

@ -2,14 +2,7 @@
# $FreeBSD$
#
PROG= pod2text
SCRIPTS=pod2text
NOMAN= true
${PROG}: ${PROG}.PL
${MINIPERL} ${MINIPERLOPT} ${PROG}.PL
.include <bsd.prog.mk>
${PROG}.PL: ${PERL5SRC}/pod/${PROG}.PL
cp -p ${.OODATE} ${.TARGET}

View File

@ -9,16 +9,20 @@ PERL5LIBSRC= ${.CURDIR}/../../libperl
MINIPERLOPT?= -I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl -I${PERL5SRC}
${PROG}: ${PROG}.PL
${MINIPERL} ${MINIPERLOPT} ${.OODATE}
.if defined(SCRIPTS)
.if !defined(NOMAN)
MAN= ${SCRIPTS}.1
.endif
${PROG}.1: ${PROG}.PL
${SCRIPTS}: ${SCRIPTS}.PL
${MINIPERL} ${MINIPERLOPT} ${.ALLSRC}
${SCRIPTS}.1: ${SCRIPTS}.PL
${MINIPERL} ${MINIPERLOPT} \
${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
${.OBJDIR}/../../pod/pod2man/pod2man ${.ALLSRC} > ${.TARGET}
${PROG}.PL: ${PERL5SRC}/utils/${PROG}.PL
ln -sf ${.OODATE} ${.TARGET}
${SCRIPTS}.PL: ${PERL5SRC}/utils/${SCRIPTS}.PL
ln -sf ${.ALLSRC} ${.TARGET}
CLEANFILES+= ${PROG}.1 ${PROG}.PL pstruct
STRIP=
CLEANFILES+= ${SCRIPTS} ${SCRIPTS}.1 ${SCRIPTS}.PL pstruct
.endif

View File

@ -2,6 +2,6 @@
# $FreeBSD$
#
PROG= c2ph
SCRIPTS=c2ph
.include <bsd.prog.mk>

View File

@ -2,6 +2,6 @@
# $FreeBSD$
#
PROG= dprofpp
SCRIPTS=dprofpp
.include <bsd.prog.mk>

View File

@ -2,7 +2,7 @@
# $FreeBSD$
#
PROG= h2ph
SCRIPTS=h2ph
beforedepend all: scripts
@ -10,7 +10,7 @@ beforedepend all: scripts
afterinstall:
cd ${DESTDIR}/usr/include; \
${MINIPERL} -I${.OBJDIR}/lib ${.OBJDIR}/${PROG} -d \
${MINIPERL} -I${.OBJDIR}/lib ${.OBJDIR}/${SCRIPTS} -d \
${DESTDIR}/usr/libdata/perl/${VERSION}/mach * */*
.PATH: ${PERL5SRC}

View File

@ -2,6 +2,6 @@
# $FreeBSD$
#
PROG= h2xs
SCRIPTS=h2xs
.include <bsd.prog.mk>

View File

@ -2,6 +2,6 @@
# $FreeBSD$
#
PROG= perlbc
SCRIPTS=perlbc
.include <bsd.prog.mk>

View File

@ -2,6 +2,6 @@
# $FreeBSD$
#
PROG= perlbug
SCRIPTS=perlbug
.include <bsd.prog.mk>

View File

@ -2,6 +2,6 @@
# $FreeBSD$
#
PROG= perlcc
SCRIPTS=perlcc
.include <bsd.prog.mk>

View File

@ -2,6 +2,6 @@
# $FreeBSD$
#
PROG= perldoc
SCRIPTS=perldoc
.include <bsd.prog.mk>

View File

@ -2,6 +2,6 @@
# $FreeBSD$
#
PROG= pl2pm
SCRIPTS=pl2pm
.include <bsd.prog.mk>

View File

@ -2,7 +2,7 @@
# $FreeBSD$
#
PROG= splain
SCRIPTS=splain
NOMAN= true
.include <bsd.prog.mk>

View File

@ -4,10 +4,25 @@
PERL5SRC= ${.CURDIR}/../../../../../contrib/perl5
PERL5LIBSRC= ${.CURDIR}/../../libperl
MINIPERLOPT?= -I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
LDFLAGS+= -L${.OBJDIR}/../../libperl
STRIP=
.include "../Makefile.inc"
MINIPERLOPT?= -I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
.if defined(SCRIPTS)
.if !defined(NOMAN)
MAN= ${SCRIPTS}.1
.endif
${SCRIPTS}: ${SCRIPTS}.PL
${MINIPERL} ${MINIPERLOPT} ${.ALLSRC}
${SCRIPTS}.1: ${SCRIPTS}.PL
${MINIPERL} ${MINIPERLOPT} \
${.OBJDIR}/../../pod/pod2man/pod2man ${.ALLSRC} > ${.TARGET}
${SCRIPTS}.PL: ${PERL5SRC}/x2p/${SCRIPTS}.PL
ln -sf ${.ALLSRC} ${.TARGET}
CLEANFILES+= ${SCRIPTS} ${SCRIPTS}.1 ${SCRIPTS}.PL
.endif

View File

@ -2,18 +2,7 @@
# $FreeBSD$
#
PROG= find2perl
SCRIPTS=find2perl
NOMAN= true
${PROG}: ${PROG}.PL
${MINIPERL} ${MINIPERLOPT} ${.OODATE}
${PROG}.1: ${PROG}.PL
${MINIPERL} ${MINIPERLOPT} ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
CLEANFILES+= ${PROG}.1 ${PROG}.PL
.include <bsd.prog.mk>
${PROG}.PL: ${PERL5SRC}/x2p/${PROG}.PL
@ln -sf ${.OODATE} ${.TARGET}

View File

@ -2,17 +2,6 @@
# $FreeBSD$
#
PROG= s2p
${PROG}: ${PROG}.PL
${MINIPERL} ${MINIPERLOPT} ${.OODATE}
${PROG}.1: ${PROG}.PL
${MINIPERL} ${MINIPERLOPT} ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
CLEANFILES+= ${PROG}.1 ${PROG}.PL
SCRIPTS=s2p
.include <bsd.prog.mk>
${PROG}.PL: ${PERL5SRC}/x2p/${PROG}.PL
@ln -sf ${.OODATE} ${.TARGET}