Fix for bootstrapping. Grr. Pointy Hat Please?

3 files changed, 14 insertions, 2 deletions

diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc
index 17cd9ab..12b4381 100644
--- a/gnu/usr.bin/perl/Makefile.inc
+++ b/gnu/usr.bin/perl/Makefile.inc
@@ -61,12 +61,14 @@ scripts: links
 	@sh cflags.sh
 	@sh writemain.sh
 	@sh myconfig.SH
-	@miniperl ${PERL5SRC}/configpm \
+	@miniperl -I. ${PERL5SRC}/configpm \
 		Config.pm Porting/Glossary myconfig
 	@ln -sf ../Config.pm lib/Config.pm
 	@touch ${.TARGET}
 
+.if !defined(NO_PERL_SCRIPT_MAKE)
 config.h:	scripts
+.endif
 
 CLEANFILES+=	links scripts
 CLEANFILES+=	config.h config.sh config_h.sh Config.pm
diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile
index 96e9d98..5985dac 100644
--- a/gnu/usr.bin/perl/libperl/Makefile
+++ b/gnu/usr.bin/perl/libperl/Makefile
@@ -13,12 +13,17 @@ SRCS=	perl.c gv.c toke.c perly.c op.c regcomp.c dump.c util.c mg.c \
 DPADD=	${LIBM}
 LDADD=	-lm
 
+NO_PERL_SCRIPT_MAKE=	true
+
 # NOPIC=	true
 
 .include <bsd.lib.mk>
 
 build-tools:	lib${LIB}.a
 
+config.h:	links
+	@sh config_h.sh
+
 .SUFFIXES:
 
 .SUFFIXES: .o .po .So .s .S .c
diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile
index f90c23d..3c8ebcd 100644
--- a/gnu/usr.bin/perl/miniperl/Makefile
+++ b/gnu/usr.bin/perl/miniperl/Makefile
@@ -16,6 +16,8 @@ LDADD=	${MYLIBPERL} -lm -lcrypt
 
 build-tools:	${PROG}
 
+NO_PERL_SCRIPT_MAKE=	true
+
 .include <bsd.prog.mk>
 
 .PATH:	${PERL5SRC}
@@ -23,4 +25,7 @@ build-tools:	${PROG}
 opmini.c:	op.c
 	ln -sf ${.OODATE} ${.TARGET}
 
-CLEANFILES+=	opmini.c
+config.h:	links
+	@sh config_h.sh
+
+CLEANFILES+=	opmini.c config.h