PERFORCE change 124419 for review
Gabor Kovesdan
gabor at FreeBSD.org
Tue Jul 31 13:29:24 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=124419
Change 124419 by gabor at gabor_server on 2007/07/31 13:28:34
- Rework do-configure and do-build a bit
Affected files ...
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.perl.mk#4 edit
.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.port.mk#5 edit
Differences ...
==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.perl.mk#4 (text+ko) ====
@@ -77,10 +77,10 @@
.if defined(PERL_CONFIGURE)
USE_PERL5= yes
-.if (defined(BATCH) && !defined(IS_INTERACTIVE))
+.if defined(BATCH) && !defined(IS_INTERACTIVE)
CONFIGURE_ENV+= PERL_MM_USE_DEFAULT="YES"
-.endif
-.endif
+.endif # defined(BATCH) && !defined(IS_INTERACTIVE)
+.endif # defined(PERL_CONFIGURE)
EXTRACT_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
PATCH_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
@@ -95,6 +95,26 @@
CONFIGURE_SCRIPT?= Makefile.PL
MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VERSION}
.undef HAS_CONFIGURE
-.endif
+.endif # defined(PERL_CONFIGURE)
+
+.if defined(PERL_CONFIGURE)
+.if !target(do-configure)
+do-configure:
+ @cd ${CONFIGURE_WRKSRC} && \
+ ${SETENV} ${CONFIGURE_ENV} \
+ ${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+.if !defined(PERL_MODBUILD)
+ @cd ${CONFIGURE_WRKSRC} && \
+ ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
+.endif # !defined(PERL_MODBUILD)
+.endif # !target(do-configure)
+.endif # defined(PERL_CONFIGURE)
+
+.if defined(PERL_MODBUILD)
-.endif
+.if !target(do-build)
+do-build:
+ @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${ALL_TARGET})
+.endif # !target(do-build)
+.endif # defined(PERL_MODBUILD)
+.endif # !defined(_PERLMKINCLUDED)
==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.port.mk#5 (text+ko) ====
@@ -3556,15 +3556,6 @@
${FALSE}; \
fi)
.endif
-.if defined(PERL_CONFIGURE)
- @cd ${CONFIGURE_WRKSRC} && \
- ${SETENV} ${CONFIGURE_ENV} \
- ${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
-.if !defined(PERL_MODBUILD)
- @cd ${CONFIGURE_WRKSRC} && \
- ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
-.endif
-.endif
.if defined(USE_IMAKE)
@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF})
.endif
@@ -3577,13 +3568,9 @@
.if defined(USE_GMAKE)
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
.else
-.if defined(PERL_MODBUILD)
- @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${ALL_TARGET})
-.else
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
.endif
.endif
-.endif
# Check conflicts
More information about the p4-projects
mailing list