diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 14:22:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 14:22:51 +0100 |
| commit | cc799ec57ca72d4bb56d34d19e9318c0b6b4b55d (patch) | |
| tree | 78546bfbb5102e4e41a762b38eef1fb0d1e54882 /mk | |
| parent | 9afcdcff6e924cdd3871dadb554105d412502b55 (diff) | |
| parent | 9c4dfaf684036828b71187836290b490395d0adc (diff) | |
Merge branch 'master' of git+ssh://openadk.org:/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 5 | ||||
| -rw-r--r-- | mk/perl.mk | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index b6de5f992..42d75bbcd 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -310,7 +310,7 @@ all: menuconfig # --------------------------------------------------------------------------- # force entering the subdir, as dependency checking is done there -.PHONY: $(CONFIG)/conf $(CONFIG)/mconf $(CONFIG)/gconf +.PHONY: $(CONFIG)/conf $(CONFIG)/mconf $(CONFIG)/conf: @$(MAKE) -C $(CONFIG) conf @@ -318,9 +318,6 @@ $(CONFIG)/conf: $(CONFIG)/mconf: @$(MAKE) -C $(CONFIG) -$(CONFIG)/gconf: - @$(MAKE) -C $(CONFIG) gconf - defconfig: .menu $(CONFIG)/conf @${BASH} ${TOPDIR}/scripts/update-sys @${BASH} ${TOPDIR}/scripts/update-pkg diff --git a/mk/perl.mk b/mk/perl.mk index 61ce6a52c..84e423920 100644 --- a/mk/perl.mk +++ b/mk/perl.mk @@ -1,2 +1,2 @@ -PERL_VERSION=5.12.3 +PERL_VERSION=5.18.1 PERL_SITEDIR:=/usr/lib/perl5/site_perl/$(PERL_VERSION)/$(CPU_ARCH)-linux |