Changeset 8fefd8b in mainline for boot/Makefile

Timestamp:

2018-10-11T14:16:33Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

0e8c158

Parents:

9286475

Message:

Preserve srv directory structure

File:

• boot/Makefile (modified) (1 diff)

boot/Makefile

@@ -44 +44 @@
         mkdir -p "$(DIST_PATH)/loc/"
         mkdir -p "$(DIST_PATH)/log/"
-        mkdir -p "$(DIST_PATH)/srv/"
         mkdir -p "$(DIST_PATH)/test/"
         mkdir -p "$(DIST_PATH)/tmp/"
         mkdir -p "$(DIST_PATH)/vol/"
         mkdir -p "$(DIST_PATH)/w/"
-        for file in $(RD_SRVS) ; do \
-                cp "$$file" "$(DIST_PATH)/srv/" ; \
+
+        for srv in $(RD_SRVS) ; do \
+                srv_dir="`dirname "$$srv"`" ; \
+                srv_name="`basename "$$srv"`" ; \
+                mkdir -p "$(DIST_PATH)/srv/$$srv_dir" ; \
+                cp "$(USPACE_PATH)/srv/$$srv/$$srv_name" "$(DIST_PATH)/srv/$$srv" ; \
         done
+
         for file in $(RD_LIBS) ; do \
                 cp "$$file" "$(DIST_PATH)/lib/" ; \
         done
+
 ifeq ($(CONFIG_DEVEL_FILES), y)
         mkdir -p "$(DIST_PATH)/inc/c/"