Changeset 3863

Timestamp:

07/26/07 12:08:52 (1 year ago)

Author:

vboxsync

Message:

/usr/lib not /usr/lib64 on Debian/64; unified debian directories

Files:

• trunk/debian/LocalConfig.kmk (modified) (1 diff)
• trunk/debian/rules (modified) (3 diffs)

trunk/debian/LocalConfig.kmk

@@ -17 +17 @@
-DEFS                    += RTPATH_APP_PRIVATE_ARCH=\"/usr/lib/virtualbox\"
-DEFS                    += RTPATH_APP_PRIVATE=\"/usr/share/virtualbox\"
-ifeq ($(BUILD_TARGET_ARCH),amd64)
-DEFS                    += RTPATH_SHARED_LIBS=\"/usr/lib64\"
-else
-DEFS                    += RTPATH_SHARED_LIBS=\"/usr/lib\"
-endif

trunk/debian/rules

@@ -47 +47 @@
-endif
-endif
-deblib   := $(shell if [ `uname -m` = "x86_64" ]; then echo "lib64"; else echo "lib"; fi)
-
-# Ubuntu dapper: gcc-4.0 does not work with recompiler, use gcc-3.4 instead
@@ -129 +128 @@
-        tar -xjC $(prefix)/opt -f $(builddir)/bin/VirtualBox.tar.bz2
-        install -d -g 0 -o 0 $(prefix)/usr/share/applications
-$(deblib)
+lib
-        install -d -g 0 -o 0 $(prefix)/usr/bin
-        install -d -g 0 -o 0 $(prefix)/usr/lib/virtualbox
@@ -144 +143 @@
-        mv $(prefix)/opt/VirtualBox-$(ver)/VBoxXPCOMIPCD $(prefix)/usr/lib/virtualbox
-        mv $(prefix)/opt/VirtualBox-$(ver)/components $(prefix)/usr/lib/virtualbox/components
-$(deblib)
+lib
-        mv $(prefix)/opt/VirtualBox-$(ver)/sdk  $(prefix)/usr/share/virtualbox
-        mv $(prefix)/opt/VirtualBox-$(ver)/nls  $(prefix)/usr/share/virtualbox