Changeset 11717 in vbox for trunk/src/libs

Timestamp:

Aug 27, 2008 5:29:48 PM (16 years ago)

Author:

vboxsync

Message:

xpcom18a4/Makefile.kmk: VBOX_ name space.

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (1 diff)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1305 +1305 @@
  VBOX_PYTHON_VER := 2$(lastword $(subst ., .,$(VBOX_PATH_PYTHON_INC)))
  ifndef VBOX_LIB_PYTHON
-  ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),solaris.amd64)
-   LIBMOD=64/
-  else
-   LIBMOD=
-  endif
-
+  VBOX_TMP := $(if $(eq $(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),solaris.amd64),64/,)
   VBOX_LIB_PYTHON := $(firstword $(wildcard \
-        /usr/lib/$(LIBMOD)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
-        /usr/local/lib/$(LIBMOD)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
-        /usr/lib/$(LIBMOD)libpython2$(SUFF_DLL) \
-        /usr/local/lib/$(LIBMOD)libpython2$(SUFF_DLL) \
-        /usr/lib/$(LIBMOD)libpython$(SUFF_DLL) \
-        /usr/local/lib/$(LIBMOD)libpython$(SUFF_DLL) \
+        /usr/lib/$(VBOX_TMP)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
+        /usr/local/lib/$(VBOX_TMP)libpython$(VBOX_PYTHON_VER)$(SUFF_DLL) \
+        /usr/lib/$(VBOX_TMP)libpython2$(SUFF_DLL) \
+        /usr/local/lib/$(VBOX_TMP)libpython2$(SUFF_DLL) \
+        /usr/lib/$(VBOX_TMP)libpython$(SUFF_DLL) \
+        /usr/local/lib/$(VBOX_TMP)libpython$(SUFF_DLL) \
         ))
   ifeq ($(VBOX_LIB_PYTHON),)