Changeset 9976 in vbox

Timestamp:

Jun 26, 2008 7:09:14 PM (17 years ago)

Author:

vboxsync

Message:

more Qt4 lib installer fixes

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox4/Makefile.kmk (modified) (1 diff)
• Installer/linux/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

@@ -118 +118 @@
   # Qt4 compiled by Sun with altered library names
   VBOX_LIBS_QT4      = $(patsubst %, VBox%, $(VBOX_MODULE_QT4))
-  VBOX_QT4_RUNTIME   = $(patsubst %, $(VBOX_PATH_QT4_LIB)/libVBox%.so, $(VBOX_MODULE_QT4))
+  VBOX_QT4_RUNTIME   = $(patsubst %, $(VBOX_PATH_QT4_LIB)/libVBox%.so.4, $(VBOX_MODULE_QT4))
  else
   VBOX_LIBS_QT4      = $(VBOX_MODULE_QT4)

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

@@ -276 +276 @@
                 | $(call DIRDEP,$(PATH_TARGET)/archive)
         $(call MSG_INST_FILE,$<,$@)
-        $(QUIET)install -D -m 0755 $(if $(VBOX_DO_STRIP),-s,) $< $@
+        $(QUIET)install -D -m $(if $(filter %.so,$<),0644,0755) $(if $(VBOX_DO_STRIP),-s,) $< $@
         $(QUIET)$(if $(VBOX_NO_LINUX_RUN_INSTALLER),,objcopy --add-gnu-debuglink=$(subst $(PATH_TARGET)/archive,$(PATH_TARGET)/archive-dbg/$(DBGPATH),$@) $@)