summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2002-02-10 19:48:19 +0000
committermarkm <markm@FreeBSD.org>2002-02-10 19:48:19 +0000
commit9c03bd91c5c443a2a69893334964e5653a724f4e (patch)
treecf301ec1684801ac4e96dc0ef14069e5adb38dbb /gnu
parent223f1b85f2a24e9e445fee257f05d835c48c5377 (diff)
downloadFreeBSD-src-9c03bd91c5c443a2a69893334964e5653a724f4e.zip
FreeBSD-src-9c03bd91c5c443a2a69893334964e5653a724f4e.tar.gz
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
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/perl/pod/Makefile.inc24
-rw-r--r--gnu/usr.bin/perl/pod/pod2html/Makefile11
-rw-r--r--gnu/usr.bin/perl/pod/pod2latex/Makefile9
-rw-r--r--gnu/usr.bin/perl/pod/pod2man/Makefile12
-rw-r--r--gnu/usr.bin/perl/pod/pod2text/Makefile9
-rw-r--r--gnu/usr.bin/perl/utils/Makefile.inc22
-rw-r--r--gnu/usr.bin/perl/utils/c2ph/Makefile2
-rw-r--r--gnu/usr.bin/perl/utils/dprofpp/Makefile2
-rw-r--r--gnu/usr.bin/perl/utils/h2ph/Makefile4
-rw-r--r--gnu/usr.bin/perl/utils/h2xs/Makefile2
-rw-r--r--gnu/usr.bin/perl/utils/perlbc/Makefile2
-rw-r--r--gnu/usr.bin/perl/utils/perlbug/Makefile2
-rw-r--r--gnu/usr.bin/perl/utils/perlcc/Makefile2
-rw-r--r--gnu/usr.bin/perl/utils/perldoc/Makefile2
-rw-r--r--gnu/usr.bin/perl/utils/pl2pm/Makefile2
-rw-r--r--gnu/usr.bin/perl/utils/splain/Makefile2
-rw-r--r--gnu/usr.bin/perl/x2p/Makefile.inc21
-rw-r--r--gnu/usr.bin/perl/x2p/find2pl/Makefile13
-rw-r--r--gnu/usr.bin/perl/x2p/s2pl/Makefile13
19 files changed, 68 insertions, 88 deletions
diff --git a/gnu/usr.bin/perl/pod/Makefile.inc b/gnu/usr.bin/perl/pod/Makefile.inc
index 1e3cbfe..8c3231d 100644
--- a/gnu/usr.bin/perl/pod/Makefile.inc
+++ b/gnu/usr.bin/perl/pod/Makefile.inc
@@ -2,13 +2,27 @@
# $FreeBSD$
#
-PERL5SRC?= ${.CURDIR}/../../../../../contrib/perl5
+PERL5SRC= ${.CURDIR}/../../../../../contrib/perl5
+PERL5LIBSRC= ${.CURDIR}/../../libperl
+
+.include "../Makefile.inc"
+
MINIPERLOPT?= -I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
-CLEANFILES+= ${PROG}.1 ${PROG}.PL
+.if defined(SCRIPTS)
+.if !defined(NOMAN)
+MAN= ${SCRIPTS}.1
+.endif
-.ORDER: ${PROG}.PL ${PROG} ${PROG}.1 ${PROG}.1.gz
+${SCRIPTS}: ${SCRIPTS}.PL
+ ${MINIPERL} ${MINIPERLOPT} ${.ALLSRC}
-STRIP=
+${SCRIPTS}.1: ${SCRIPTS}.PL
+ ${MINIPERL} ${MINIPERLOPT} \
+ ${.OBJDIR}/../pod2man/pod2man ${.ALLSRC} > ${.TARGET}
-.include "../Makefile.inc"
+${SCRIPTS}.PL: ${PERL5SRC}/pod/${SCRIPTS}.PL
+ ln -sf ${.ALLSRC} ${.TARGET}
+
+CLEANFILES+= ${SCRIPTS} ${SCRIPTS}.1 ${SCRIPTS}.PL
+.endif
diff --git a/gnu/usr.bin/perl/pod/pod2html/Makefile b/gnu/usr.bin/perl/pod/pod2html/Makefile
index e3f3061..8c3cbab 100644
--- a/gnu/usr.bin/perl/pod/pod2html/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2html/Makefile
@@ -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}
diff --git a/gnu/usr.bin/perl/pod/pod2latex/Makefile b/gnu/usr.bin/perl/pod/pod2latex/Makefile
index b2ea8b3..ad0bec1 100644
--- a/gnu/usr.bin/perl/pod/pod2latex/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2latex/Makefile
@@ -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}
diff --git a/gnu/usr.bin/perl/pod/pod2man/Makefile b/gnu/usr.bin/perl/pod/pod2man/Makefile
index 37cc2e6..0d44889 100644
--- a/gnu/usr.bin/perl/pod/pod2man/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2man/Makefile
@@ -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}
diff --git a/gnu/usr.bin/perl/pod/pod2text/Makefile b/gnu/usr.bin/perl/pod/pod2text/Makefile
index 80cbb57..1ad9267 100644
--- a/gnu/usr.bin/perl/pod/pod2text/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2text/Makefile
@@ -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}
diff --git a/gnu/usr.bin/perl/utils/Makefile.inc b/gnu/usr.bin/perl/utils/Makefile.inc
index a82b1ce..80b2f6f 100644
--- a/gnu/usr.bin/perl/utils/Makefile.inc
+++ b/gnu/usr.bin/perl/utils/Makefile.inc
@@ -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
- ${MINIPERL} ${MINIPERLOPT} \
- ${.OBJDIR}/../../pod/pod2man/pod2man ${.OODATE} > ${.TARGET}
+${SCRIPTS}: ${SCRIPTS}.PL
+ ${MINIPERL} ${MINIPERLOPT} ${.ALLSRC}
-${PROG}.PL: ${PERL5SRC}/utils/${PROG}.PL
- ln -sf ${.OODATE} ${.TARGET}
+${SCRIPTS}.1: ${SCRIPTS}.PL
+ ${MINIPERL} ${MINIPERLOPT} \
+ ${.OBJDIR}/../../pod/pod2man/pod2man ${.ALLSRC} > ${.TARGET}
-CLEANFILES+= ${PROG}.1 ${PROG}.PL pstruct
+${SCRIPTS}.PL: ${PERL5SRC}/utils/${SCRIPTS}.PL
+ ln -sf ${.ALLSRC} ${.TARGET}
-STRIP=
+CLEANFILES+= ${SCRIPTS} ${SCRIPTS}.1 ${SCRIPTS}.PL pstruct
+.endif
diff --git a/gnu/usr.bin/perl/utils/c2ph/Makefile b/gnu/usr.bin/perl/utils/c2ph/Makefile
index 0225a28..c2b780b 100644
--- a/gnu/usr.bin/perl/utils/c2ph/Makefile
+++ b/gnu/usr.bin/perl/utils/c2ph/Makefile
@@ -2,6 +2,6 @@
# $FreeBSD$
#
-PROG= c2ph
+SCRIPTS=c2ph
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/utils/dprofpp/Makefile b/gnu/usr.bin/perl/utils/dprofpp/Makefile
index 5ffdfcc..8b289e1 100644
--- a/gnu/usr.bin/perl/utils/dprofpp/Makefile
+++ b/gnu/usr.bin/perl/utils/dprofpp/Makefile
@@ -2,6 +2,6 @@
# $FreeBSD$
#
-PROG= dprofpp
+SCRIPTS=dprofpp
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/utils/h2ph/Makefile b/gnu/usr.bin/perl/utils/h2ph/Makefile
index 6951a3b..6d3c51e 100644
--- a/gnu/usr.bin/perl/utils/h2ph/Makefile
+++ b/gnu/usr.bin/perl/utils/h2ph/Makefile
@@ -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}
diff --git a/gnu/usr.bin/perl/utils/h2xs/Makefile b/gnu/usr.bin/perl/utils/h2xs/Makefile
index fa635db..a45a926 100644
--- a/gnu/usr.bin/perl/utils/h2xs/Makefile
+++ b/gnu/usr.bin/perl/utils/h2xs/Makefile
@@ -2,6 +2,6 @@
# $FreeBSD$
#
-PROG= h2xs
+SCRIPTS=h2xs
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/utils/perlbc/Makefile b/gnu/usr.bin/perl/utils/perlbc/Makefile
index 47a247d..ec0fa29 100644
--- a/gnu/usr.bin/perl/utils/perlbc/Makefile
+++ b/gnu/usr.bin/perl/utils/perlbc/Makefile
@@ -2,6 +2,6 @@
# $FreeBSD$
#
-PROG= perlbc
+SCRIPTS=perlbc
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/utils/perlbug/Makefile b/gnu/usr.bin/perl/utils/perlbug/Makefile
index baea837..f258f55 100644
--- a/gnu/usr.bin/perl/utils/perlbug/Makefile
+++ b/gnu/usr.bin/perl/utils/perlbug/Makefile
@@ -2,6 +2,6 @@
# $FreeBSD$
#
-PROG= perlbug
+SCRIPTS=perlbug
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/utils/perlcc/Makefile b/gnu/usr.bin/perl/utils/perlcc/Makefile
index 02ce3a3..b38ab85 100644
--- a/gnu/usr.bin/perl/utils/perlcc/Makefile
+++ b/gnu/usr.bin/perl/utils/perlcc/Makefile
@@ -2,6 +2,6 @@
# $FreeBSD$
#
-PROG= perlcc
+SCRIPTS=perlcc
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/utils/perldoc/Makefile b/gnu/usr.bin/perl/utils/perldoc/Makefile
index 5d55722..91ef512 100644
--- a/gnu/usr.bin/perl/utils/perldoc/Makefile
+++ b/gnu/usr.bin/perl/utils/perldoc/Makefile
@@ -2,6 +2,6 @@
# $FreeBSD$
#
-PROG= perldoc
+SCRIPTS=perldoc
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/utils/pl2pm/Makefile b/gnu/usr.bin/perl/utils/pl2pm/Makefile
index fea06a3..d5b3ff4 100644
--- a/gnu/usr.bin/perl/utils/pl2pm/Makefile
+++ b/gnu/usr.bin/perl/utils/pl2pm/Makefile
@@ -2,6 +2,6 @@
# $FreeBSD$
#
-PROG= pl2pm
+SCRIPTS=pl2pm
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/utils/splain/Makefile b/gnu/usr.bin/perl/utils/splain/Makefile
index b05337e..ab1ae59 100644
--- a/gnu/usr.bin/perl/utils/splain/Makefile
+++ b/gnu/usr.bin/perl/utils/splain/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-PROG= splain
+SCRIPTS=splain
NOMAN= true
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/x2p/Makefile.inc b/gnu/usr.bin/perl/x2p/Makefile.inc
index 7f8371c..fb78cff 100644
--- a/gnu/usr.bin/perl/x2p/Makefile.inc
+++ b/gnu/usr.bin/perl/x2p/Makefile.inc
@@ -4,10 +4,25 @@
PERL5SRC= ${.CURDIR}/../../../../../contrib/perl5
PERL5LIBSRC= ${.CURDIR}/../../libperl
+
+.include "../Makefile.inc"
+
MINIPERLOPT?= -I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
-LDFLAGS+= -L${.OBJDIR}/../../libperl
+.if defined(SCRIPTS)
+.if !defined(NOMAN)
+MAN= ${SCRIPTS}.1
+.endif
-STRIP=
+${SCRIPTS}: ${SCRIPTS}.PL
+ ${MINIPERL} ${MINIPERLOPT} ${.ALLSRC}
-.include "../Makefile.inc"
+${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
diff --git a/gnu/usr.bin/perl/x2p/find2pl/Makefile b/gnu/usr.bin/perl/x2p/find2pl/Makefile
index 5453d5e..ff5a159 100644
--- a/gnu/usr.bin/perl/x2p/find2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/find2pl/Makefile
@@ -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}
diff --git a/gnu/usr.bin/perl/x2p/s2pl/Makefile b/gnu/usr.bin/perl/x2p/s2pl/Makefile
index 63e6062..e10e30c 100644
--- a/gnu/usr.bin/perl/x2p/s2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/s2pl/Makefile
@@ -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}
OpenPOWER on IntegriCloud