Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Sep 2001 21:47:25 +0300
From:      Ruslan Ermilov <ru@FreeBSD.org>
To:        Mark Murray <markm@FreeBSD.org>
Cc:        cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject:   Re: cvs commit: src/gnu/usr.bin/perl Makefile Makefile.inc src/gnu/usr.bin/perl/utils Makefile.inc
Message-ID:  <20010920214725.A70569@sunbay.com>
In-Reply-To: <200109201222.f8KCMfT66048@freefall.freebsd.org>; from markm@FreeBSD.org on Thu, Sep 20, 2001 at 05:22:29AM -0700
References:  <200109201222.f8KCMfT66048@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Sep 20, 2001 at 05:22:29AM -0700, Mark Murray wrote:
> markm       2001/09/20 05:22:27 PDT
> 
>   Modified files:
>     gnu/usr.bin/perl     Makefile Makefile.inc 
>     gnu/usr.bin/perl/utils Makefile.inc 
>   Log:
>   Through some hackery-pokery, allow folks to cd to src/gnu/usr.bin/perl
>   and do the usual "make obj && make depend all".
>   
>   This sort of stuff makes my teeth itch, but folks wanted it badly
>   enough, so here it is.
>   
Mark, how about this instead?

Most mortals won't need it anyway (build Perl outside ``buildworld'').
For those interested in standalone builds, the WITH_MINIPERL knob is
provided:

	make -DWITH_MINIPERL obj
	make -DWITH_MINIPERL depend
	make -DWITH_MINIPERL all

Index: Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	2001/04/03 18:38:50	1.14
+++ Makefile	2001/09/20 18:45:23
@@ -1,6 +1,12 @@
 # $FreeBSD: src/gnu/usr.bin/perl/Makefile,v 1.14 2001/04/03 18:38:50 joe Exp $
 
-SUBDIR= libperl perl suidperl library pod utils x2p BSDPAN
+SUBDIR=		libperl
+
+.if defined(WITH_MINIPERL)
+SUBDIR+=	miniperl
+.endif
+
+SUBDIR+=	perl suidperl library pod utils x2p BSDPAN
 
 MAINTAINER=markm@freebsd.org
 
Index: Makefile.inc
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/Makefile.inc,v
retrieving revision 1.23
diff -u -r1.23 Makefile.inc
--- Makefile.inc	2001/05/31 11:04:52	1.23
+++ Makefile.inc	2001/09/20 18:45:23
@@ -2,6 +2,13 @@
 
 PERL5SRC?= ${.CURDIR}/../../../../contrib/perl5
 PERL5LIBSRC?= ${.CURDIR}/../libperl
+.if defined(WITH_MINIPERL)
+.if exists(${.OBJDIR}/../miniperl/miniperl)
+MINIPERL?=	${.OBJDIR}/../miniperl/miniperl
+.elif exists(${.OBJDIR}/../../miniperl/miniperl)
+MINIPERL?=	${.OBJDIR}/../../miniperl/miniperl
+.endif
+.endif
 MINIPERL?=	miniperl
 
 BINDIR?=	/usr/bin
Index: library/Makefile.inc
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/library/Makefile.inc,v
retrieving revision 1.7
diff -u -r1.7 Makefile.inc
--- library/Makefile.inc	2001/05/26 17:40:09	1.7
+++ library/Makefile.inc	2001/09/20 18:45:23
@@ -2,7 +2,6 @@
 
 PERL5SRC?=	${.CURDIR}/../../../../../contrib/perl5
 PERL5LIBSRC?=	${.CURDIR}/../../libperl
-MINIPERL=	miniperl
 
 MODULEDIR?=	${MODULE}
 
Index: pod/Makefile.inc
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/pod/Makefile.inc,v
retrieving revision 1.4
diff -u -r1.4 Makefile.inc
--- pod/Makefile.inc	2000/11/20 02:17:33	1.4
+++ pod/Makefile.inc	2001/09/20 18:45:24
@@ -4,7 +4,6 @@
 
 PERL5SRC?=	${.CURDIR}/../../../../../contrib/perl5
 MINIPERLOPT?=	-I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
-MINIPERL=	miniperl
 
 CLEANFILES+=	${PROG}.1 ${PROG}.PL
 
Index: x2p/Makefile.inc
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/perl/x2p/Makefile.inc,v
retrieving revision 1.7
diff -u -r1.7 Makefile.inc
--- x2p/Makefile.inc	2000/11/20 02:17:34	1.7
+++ x2p/Makefile.inc	2001/09/20 18:45:24
@@ -5,7 +5,6 @@
 PERL5SRC=	${.CURDIR}/../../../../../contrib/perl5
 PERL5LIBSRC=	${.CURDIR}/../../libperl
 MINIPERLOPT?=	-I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
-MINIPERL=	miniperl
 
 LDFLAGS+=	-L${.OBJDIR}/../../libperl
 

-- 
Ruslan Ermilov		Oracle Developer/DBA,
ru@sunbay.com		Sunbay Software AG,
ru@FreeBSD.org		FreeBSD committer,
+380.652.512.251	Simferopol, Ukraine

http://www.FreeBSD.org	The Power To Serve
http://www.oracle.com	Enabling The Information Age

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010920214725.A70569>