diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-11 20:49:33 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-11 20:49:33 +0100 |
| commit | 070cac9d32fa7a0f7f4d52eddec901d248cdfae3 (patch) | |
| tree | 1a4cf65e381c5ce777316fb67e69018feb741f8f /mk | |
| parent | d82534d3a6bfb048cc7bdc694654c15a975d7af6 (diff) | |
| parent | 644de656b41be3def5d2d0f276f7e24c0b367ea1 (diff) | |
resolve conflict
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/build.mk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/build.mk b/mk/build.mk index 31eb683e0..95f047354 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -249,7 +249,9 @@ endif ifneq (,$(filter rb%,${TARGET})) @echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig endif - @$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN) >/dev/null + @if [ ! -z "$(TARGET)" ];then \ + $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ + fi modconfig: ifeq (${OStype},Linux) |