Changeset 44214 in vbox

Timestamp:

Dec 29, 2012 12:45:28 AM (12 years ago)

Author:

vboxsync

Message:

Installer/solaris/Makefile.kmk: Fixed symlink rules.

File:

• trunk/src/VBox/Installer/solaris/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -689 +689 @@
         $(QUIET)$(RM) -f $(SOLARIS_BASEINST_DIR)/$(PKG_FILENAME).tar.gz
         $(QUIET)$(RM) -f $(SOLARIS_BASEINST_DIR)/$(PKG_FILENAME).pkg
-        $(call MSG_L1,Packaging completed.)
+        $(call MSG_L1,Packaging $@ is completed.)
 
 
@@ -784 +784 @@
 # as those binaries do not originate from $(PATH_STAGE_BIN)
 #
-$(addprefix $(SOLARIS_USRBIN_DIR)/,$(SOLARIS_USRBIN_LINKS)): \
-                $(SOLARIS_USRBIN_DIR)/% : % | $$(dir $$@)
+## @todo r-bird: WTF is this supposed to do? The dependency is meaningless (VirtualBox - no path or anything).
+#                Why this works from root is pure luck and has to do with kBuild's short target aliases.
+#$(addprefix $(SOLARIS_USRBIN_DIR)/,$(SOLARIS_USRBIN_LINKS)): \
+#               $(SOLARIS_USRBIN_DIR)/% : % | $$(dir $$@)
+#       $(LN_SYMLINK) -f ../../$(SOLARIS_VBOXINST_SUBDIR)/VBox.sh $@
+## Here is what probably was intended:
+$(addprefix $(SOLARIS_USRBIN_DIR)/,$(SOLARIS_USRBIN_LINKS)): | $$(dir $$@)
         $(LN_SYMLINK) -f ../../$(SOLARIS_VBOXINST_SUBDIR)/VBox.sh $@
 
@@ -799 +804 @@
         $(call MSG_L1,Installing debug binaries $(SOLARIS_DBG_DIR))
         $(call MSG_L1,Packing $@)
-        $(QUIET)/usr/sfw/bin/gtar --dereference --owner 0 --group 0 \
+        $(QUIET)$(SOL_GTAR) --dereference --owner 0 --group 0 \
                 -cjRhf "$(PATH_STAGE_BIN)/$(DBG_ARCHIVE)" -C "$(SOLARIS_INST_OUT_DIR)" "$(SOLARIS_DBG_DIR_NAME)"
         $(QUIET)$(CHMOD) 0644 $@
+        $(call MSG_L1,Packaging $@ is completed.)
 
 #