Changeset 38082 in vbox for trunk/src/VBox/Additions/freebsd

Timestamp:

Jul 20, 2011 2:26:24 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

73029

Message:

*.kmk: Installation/staging adjustments (kBuild 0.2.0 preps).

File:

• trunk/src/VBox/Additions/freebsd/Makefile.kmk (modified) (7 diffs)

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

@@ -43 +43 @@
 ifndef VBOX_OSE
  BLDDIRS     += $(VBOX_FBSD_ADD_INS_OUT_DIR) $(VBOX_FBSD_ADD_INS_OUT_DIR)/module
- PACKING     += $(PATH_BIN)/additions/VBoxFreeBSDAdditions.tbz
+ PACKING     += $(PATH_STAGE_BIN)/additions/VBoxFreeBSDAdditions.tbz
  OTHER_CLEAN += $(PACKING)
 endif
@@ -92 +92 @@
 # pattern rule for copying the debug info from the VBOX_FBSD_ADD_STRIP_BIN files to the installation directory
 $(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/,$(VBOX_FBSD_ADD_DBG_SYM_FILES)): \
-                $(VBOX_FBSD_ADD_INS_OUT_DIR)/%.dbgsym : $(PATH_BIN)/additions/% | $$(dir $$@)
+                $(VBOX_FBSD_ADD_INS_OUT_DIR)/%.dbgsym : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
         $(call MSG_TOOL,copydbg,$<,$@)
         $(QUIET)objcopy --only-keep-debug $< $@
@@ -98 +98 @@
 # pattern rule for stripping and copying the VBOX_FBSD_ADD_STRIP_BIN files to the installation directory
 $(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/,$(VBOX_FBSD_ADD_STRIP_BIN)): \
-                $(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_BIN)/additions/% \
+                $(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_STAGE_BIN)/additions/% \
                 $(VBOX_FBSD_ADD_INS_OUT_DIR)/%.dbgsym \
                 | $$(dir $$@)
@@ -107 +107 @@
 # pattern rule for stripping and copying the VBOX_FBSD_ADD_STRIP_OBJ files to the installation directory
 $(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/,$(VBOX_FBSD_ADD_STRIP_OBJ)): \
-                $(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_BIN)/additions/% | $$(dir $$@)
+                $(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
         $(call MSG_INST_FILE,$<,$@)
 ifeq ($(VBOX_DO_STRIP),)
@@ -119 +119 @@
 # pattern rule for copying the VBOX_FBSD_ADD_MODULES files to the installation directory
 $(VBOX_FBSD_ADD_INS_MODULES): \
-                $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/% : $(PATH_BIN)/additions/src/% | $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/
+                $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/% : $(PATH_STAGE_BIN)/additions/src/% | $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/
         $(call MSG_INST_FILE,$<,$@)
 # Remove target directories first, otherwise the behaviour of cp will not be
@@ -173 +173 @@
 #        we've got everything included.
 #
-$(PATH_BIN)/additions/VBoxFreeBSDAdditions.tbz: \
+$(PATH_STAGE_BIN)/additions/VBoxFreeBSDAdditions.tbz: \
                 $(INSTARGET_fbsd_add_inst-nobin) \
                 $(INSTARGET_fbsd_add_inst-bin) \
@@ -179 +179 @@
                 $(VBOX_FBSD_ADD_INS_MODULES) \
                 $(VBOX_FBSD_ADD_INS_OUT_DIR)/install.sh \
-                $(wildcard $(PATH_BIN)/additions/src/*) \
-                $(wildcard $(PATH_BIN)/additions/src/*/*) \
-                $(wildcard $(PATH_BIN)/additions/src/*/*/*) \
-                $(wildcard $(PATH_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)
         pkg_create \