Changeset 8b863a62 in mainline for boot/Makefile

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• boot/Makefile (modified) (2 diffs)

boot/Makefile

@@ -80 +80 @@
                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
         done
+        if ls $(DIST_OVERLAY_PATH)/* >/dev/null; then \
+                cp -r -L $(DIST_OVERLAY_PATH)/* "$(DIST_PATH)"; \
+        fi
 
 clean: clean_dist
@@ -94 +97 @@
         rm -f $(USPACE_PATH)/dist/srv/*
         rm -rf $(USPACE_PATH)/dist/drv/*
-        rm -f $(USPACE_PATH)/dist/lib/*
+        rm -rf $(USPACE_PATH)/dist/lib/*
         rm -rf $(USPACE_PATH)/dist/inc/*
         rm -f $(USPACE_PATH)/dist/app/*