diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
| commit | 29486d09fc74ca557f97136ac852767e48a981f2 (patch) | |
| tree | 7ea4c6a266b67fd2e87c0b8ed6d6df798b5b637b /package/base-files/Makefile | |
| parent | e473446ff8a93fb8cdc52494b4d6ee15bc15bf61 (diff) | |
| parent | 92de2ee1c2848fe50b9908bb679e0c9edcd4a867 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/base-files/Makefile')
| -rw-r--r-- | package/base-files/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 841cc29f7..3f63df3e6 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -26,7 +26,8 @@ INSTALL_STYLE:= manual do-install: $(CP) ./src/* $(IDIR_BASE_FILES) - $(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES) + # allow this to fail, as there might be no target-specific files to copy + -$(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES) ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y) @-rm $(IDIR_BASE_FILES)/etc/network/interfaces endif |