Changeset 20314 in vbox

Timestamp:

Jun 5, 2009 11:09:07 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/Installer: fixed VBoxPython.so path.

File:

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

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

@@ -69 +69 @@
  SOLARIS_DBG_DIR_ISA   := $(SOLARIS_DBG_DIR_64)
  SOL_DBG_OBJCOPY       := /usr/sfw/bin/gobjcopy --only-keep-debug
+ SOL64_PKG := 1
 else
  SOLARIS_VBOXINST_DIR_ISA    := $(SOLARIS_VBOXINST_DIR_32)
@@ -398 +399 @@
         $(SOLARIS_DIR_NAME_64)/nls \
         $(SOLARIS_DIR_NAME_64)/accessible \
-        $(SOLARIS_DIR_NAME_64)/$(VBOX_SOL_PYTHON_DIR_64) \
+        $(VBOX_SOL_PYTHON_DIR_64) \
         $(SOLARIS_DIR_NAME_32) \
         $(SOLARIS_DIR_NAME_32)/components \
@@ -423 +424 @@
         $(SOLARIS_DIR_NAME_64)/components \
         $(SOLARIS_DIR_NAME_64)/accessible \
-        $(SOLARIS_DIR_NAME_64)/$(VBOX_SOL_PYTHON_DIR_64) \
+        $(VBOX_SOL_PYTHON_DIR_64) \
         $(SOLARIS_DIR_NAME_32) \
         $(SOLARIS_DIR_NAME_32)/components \
@@ -498 +499 @@
         $(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS)/solaris.amd64/libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2   $(SOLARIS_VBOXINST_DIR_64)/libSDL-1.2.so.0,)
         @# @todo -XXX- how to get rid of this manual MKDIR ?
-        $(QUIET)$(MKDIR) -p $(SOLARIS_VBOXINST_DIR_64)/$(VBOX_SOL_PYTHON_DIR_64)
-        $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN_32)/VBoxPython.so    $(SOLARIS_VBOXINST_DIR_32)/VBoxPython.so,)
-        $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN_64)/VBoxPython.so    $(SOLARIS_VBOXINST_DIR_64)/$(VBOX_SOL_PYTHON_DIR_64)/VBoxPython.so,)
+        $(QUIET)$(MKDIR) -p $(SOLARIS_VBOXINST_DIR)/$(VBOX_SOL_PYTHON_DIR_64)
+        $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN_32)/VBoxPython.so    $(SOLARIS_VBOXINST_DIR)/VBoxPython.so,)
+        $(QUIET)$(if $(VBOX_WITH_PYTHON),$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN_64)/VBoxPython.so    $(SOLARIS_VBOXINST_DIR)/$(VBOX_SOL_PYTHON_DIR_64)/VBoxPython.so,)
         $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(SOLARIS_PATH_QT_32)/bin/qtconfig                                $(SOLARIS_VBOXINST_DIR_32)/VBoxQtconfig,)
         $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(SOLARIS_PATH_QT_64)/bin/qtconfig                                $(SOLARIS_VBOXINST_DIR_64)/VBoxQtconfig,)
@@ -514 +515 @@
         @# @todo -XXX- how to get rid of this manual MKDIR ?
  ifdef VBOX_WITH_PYTHON
-        $(QUIET)$(if $(SOL64_PKG),$(MKDIR) -p $(SOLARIS_VBOXINST_DIR_64)/$(VBOX_SOL_PYTHON_DIR_64),)
-        $(QUIET)$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN)/VBoxPython.so       $(SOLARIS_VBOXINST_DIR_ISA)/$(if $(SOL64_PKG),$(VBOX_SOL_PYTHON_DIR_64)/,)VBoxPython.so
+        $(QUIET)$(if $(SOL64_PKG),$(MKDIR) -p $(SOLARIS_VBOXINST_DIR)/$(VBOX_SOL_PYTHON_DIR_64),)
+        $(QUIET)$(INSTALL) -m 0644 $(if $(VBOX_DO_STRIP),-s) $(SOLARIS_OUT_BIN)/VBoxPython.so       $(SOLARIS_VBOXINST_DIR)/$(if $(SOL64_PKG),$(VBOX_SOL_PYTHON_DIR_64)/,)VBoxPython.so
  endif
         $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0755 $(VBOX_PATH_QT4)/bin/qtconfig                                     $(SOLARIS_VBOXINST_DIR_ISA)/VBoxQtconfig,)