diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-25 13:01:56 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-25 13:01:56 +0200 |
| commit | 7f3beb6e14c70030395275040e17baeb8c109541 (patch) | |
| tree | bfacfb7fe2c4d34c46d9984863173fddfa326484 /mk | |
| parent | 6765a17f36ebd3493758f23d1170dbe01c86f406 (diff) | |
| parent | d2018a1e2a1ca6eac95d6c65e90c273f31d1f196 (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/package.mk | 2 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 6 |
4 files changed, 2 insertions, 9 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/package.mk b/mk/package.mk index 66b3b8a25..964763f44 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -99,7 +99,7 @@ build-all-pkgs: ${_IPKGS_COOKIE} # 5.) description for the package, $(PKG_DESCR) # 6.) section of the package, $(PKG_SECTION) # 7.) special package options $(PKG_OPTS) -# noscripts -> do not install scripts to $(STAGING_TARGET_DIR)/target/scripts +# noscripts -> do not install scripts to $(STAGING_TARGET_DIR)/scripts # (needed for example for autoconf/automake) # noremove -> do not remove files from $(STAGING_TARGET_DIR)/target while # cleaning (needed for toolchain packages like glibc/eglibc) 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 |