Changeset 43323 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Sep 13, 2012 2:34:14 PM (12 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: fix makefile dependencies.

File:

• trunk/src/VBox/Additions/linux/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -281 +281 @@
 endif
 
-# pattern rule for copying the VBOX_LNX_ADD_KMOD files to the installation directory
-$(addprefix $(VBOX_LNX_ADD_INST_KMOD_DIR),$(VBOX_LNX_ADD_KMOD_DIRS) $(VBOX_LNX_ADD_KMOD_FILES)): \
+# pattern rules for copying the VBOX_LNX_ADD_KMOD files to the installation directory
+$(addprefix $(VBOX_LNX_ADD_INST_KMOD_DIR),$(VBOX_LNX_ADD_KMOD_DIRS)): \
+                $(VBOX_LNX_ADD_INST_KMOD_DIR_MOD)% : \
+                $(PATH_STAGE_BIN)/additions/src/% \
+                $(wildcard $(PATH_STAGE_BIN)/additions/src/%*) \
+                $(wildcard $(PATH_STAGE_BIN)/additions/src/%*/*) \
+                $(wildcard $(PATH_STAGE_BIN)/additions/src/%*/*/*) \
+                $(wildcard $(PATH_STAGE_BIN)/additions/src/%*/*/*/*) \
+                $(wildcard $(PATH_STAGE_BIN)/additions/src/%*/*/*/*/*) \
+                $(VBOX_VERSION_STAMP) \
+                | $$(dir $$(patsubst $$(PERCENT)/,$$(PERCENT),$$@))
+        $(call MSG_INST_DIR,$<,$@)
+        $(QUIET)$(RM) -Rf $(filter-out $(VBOX_LNX_ADD_INST_KMOD_DIR_MOD),$(wildcard $(VBOX_LNX_ADD_INST_KMOD_DIR)*/))
+        $(QUIET)$(CP) -RPf -- $< $@
+
+$(addprefix $(VBOX_LNX_ADD_INST_KMOD_DIR),$(VBOX_LNX_ADD_KMOD_FILES)): \
                 $(VBOX_LNX_ADD_INST_KMOD_DIR_MOD)% : \
                 $(PATH_STAGE_BIN)/additions/src/% \
                 | $$(dir $$(patsubst $$(PERCENT)/,$$(PERCENT),$$@))
-        $(call MSG_INST_DIR,$<,$@)
-        $(QUIET)$(RM) -Rf $@
+        $(call MSG_INST_FILE,$<,$@)
         $(QUIET)$(CP) -RPf -- $< $@
 
@@ -377 +390 @@
 # this file needs editing before it can be included in the generic installer.
 $(VBOX_LNX_ADD_INST_STAGE_DIR)install.sh: \
-                $(VBOX_PATH_LNX_INST_SRC)run-inst.sh | $$(dir $$@)
+                $(VBOX_PATH_LNX_INST_SRC)run-inst.sh \
+                $(VBOX_VERSION_STAMP) | $$(dir $$@)
         $(RM) -f -- $@
         $(QUIET)$(SED) \