diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 16:59:37 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-24 16:59:37 +0200 |
| commit | f5236cc7c2fc9fe1c2b07302b23345099e82c8d9 (patch) | |
| tree | 279abdc69fe27c5be5b995b783d3482e155af1aa /mk | |
| parent | b9487e5ccd1e2cd63994b6b93927840ad5eabf90 (diff) | |
| parent | cbdfc3b84ec5a246b83fb991fd865754b841f9c5 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 6 |
3 files changed, 1 insertions, 8 deletions
diff --git a/mk/build.mk b/mk/build.mk index b597dbc61..f784c99db 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -12,7 +12,6 @@ CONFIG_CONFIG_IN = Config.in CONFIG = config DEFCONFIG= ADK_DEBUG=n \ ADK_STATIC=n \ - ADK_LOCALES=n \ ADK_MAKE_PARALLEL=y \ ADK_MAKE_JOBS=4 \ ADK_LEAVE_ETC_ALONE=n \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index d6ac45cc2..f0af93810 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -87,7 +87,7 @@ else ifeq ($(strip ${CONFIG_STYLE}),) --enable-static \ --disable-dependency-tracking \ --disable-libtool-lock \ - $(NLS) \ + --disable-nls \ ${CONFIGURE_ARGS} $(MAKE_TRACE) else @echo "Invalid CONFIG_STYLE '${CONFIG_STYLE}'" >&2 diff --git a/mk/vars.mk b/mk/vars.mk index e84e8b86b..8e147b23d 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -242,10 +242,4 @@ ifeq ($(ADK_HOST_CYGWIN),y) EXEEXT:= .exe endif -ifeq ($(ADK_LOCALES),y) -NLS:= --enable-nls -else -NLS:= --disable-nls -endif - include $(TOPDIR)/mk/mirrors.mk |