make/common/Defs-modules.gmk

Print this page

        

@@ -112,17 +112,29 @@
 ifndef MODULE
   MODULE = other
 endif
 override MODULE_DEST_DIR = $(SUBMODULES_DIR)/$(strip $(MODULE))
 
-MODULE_PATH_PATTERN = -e 's%.*\/classes\/%classes\/%' \
+ifeq ($(PLATFORM), windows)
+    MODULE_PATH_PATTERN = -e 's%.*\/classes\/%classes\/%' \
                       -e 's%.*\/$(UNIQUE_PATH_PATTERN)\/%classes\/%' \
-                      -e 's%.*\/lib\/%lib\/%' \
+                          -e 's%.*\/lib\/%etc\/%' \
+                          -e 's%.*\/bin\/%lib\/%' \
+                          -e 's%.*\/include\/%include\/%' \
+                          -e 's%.*\/demo\/%demo\/%' \
+                          -e 's%.*\/sample\/%sample\/%'
+
+else
+    MODULE_PATH_PATTERN = -e 's%.*\/classes\/%classes\/%' \
+                          -e 's%.*\/$(UNIQUE_PATH_PATTERN)\/%classes\/%' \
+                          -e 's%.*\/lib\/$(LIBARCH)\/%lib\/%' \
+                          -e 's%.*\/lib\/%etc\/%' \
                       -e 's%.*\/bin\/%bin\/%' \
                       -e 's%.*\/include\/%include\/%' \
                       -e 's%.*\/demo\/%demo\/%' \
                       -e 's%.*\/sample\/%sample\/%'
+endif
 
 # Gets the module destination corresponding to the specified directory
 define GetModuleDest
 $(shell $(ECHO) $1 | $(SED) $(MODULE_PATH_PATTERN) | \
     $(NAWK) '{print "$(MODULE_DEST_DIR)/"$$0}')