diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-17 07:27:01 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-17 07:27:01 +0100 |
| commit | a07e197d7552bed16d7c9bf428d4a43a3f458a23 (patch) | |
| tree | da39ede4c33e62e1124ffd15d27c41cbe1c1f64c /mk/pkg-bottom.mk | |
| parent | 753383bdf29033a1c7244e31c42c2f5d9906010f (diff) | |
| parent | f91c0a6d288596bf002df4f750ab77e0c241e924 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/pkg-bottom.mk')
| -rw-r--r-- | mk/pkg-bottom.mk | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index ed892ce2c..1112f0cc3 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -84,12 +84,19 @@ else ifneq ($(filter basic,${CONFIG_STYLE}),) ${CONFIGURE_ARGS} $(MAKE_TRACE) else ifneq ($(filter perl,${CONFIG_STYLE}),) @$(CMD_TRACE) "configuring perl module... " - cd ${WRKBUILD}; \ - PATH='${HOST_PATH}' \ - PERL_MM_USE_DEFAULT=1 \ - PERL_AUTOINSTALL=--skipdeps \ - $(PERL_ENV) \ - perl-host Makefile.PL ${CONFIGURE_ARGS} + if [ -f ${WRKBUILD}/Makefile.PL ]; then \ + cd ${WRKBUILD}; \ + PATH='${HOST_PATH}' \ + PERL_MM_USE_DEFAULT=1 \ + PERL_AUTOINSTALL=--skipdeps \ + $(PERL_ENV) \ + perl-host Makefile.PL ${CONFIGURE_ARGS}; \ + else \ + cd ${WRKBUILD}; \ + PATH='${HOST_PATH}' \ + $(PERL_ENV) \ + perl-host Build.PL; \ + fi else ifeq ($(strip ${CONFIG_STYLE}),) @$(CMD_TRACE) "configuring... " cd ${WRKBUILD}; rm -f config.{cache,status}; \ @@ -114,7 +121,7 @@ else @exit 1 endif @${MAKE} post-configure $(MAKE_TRACE) - touch $@ + @touch $@ # do a parallel build if requested && package doesn't force disable it ifeq (${ADK_MAKE_PARALLEL},y) |
