Changeset 36782 in vbox for trunk/src/VBox/Installer/linux/debian/rules

Timestamp:

Apr 21, 2011 7:57:54 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71327

Message:

deb/rpm: misc fixes and sync debian/

File:

• trunk/src/VBox/Installer/linux/debian/rules (modified) (3 diffs)

trunk/src/VBox/Installer/linux/debian/rules

@@ -68 +68 @@
 debver   :=$(subst _ALPHA,~alpha,$(subst _BETA,~beta,$(ver)))$(svnver)$(if \
                 $(BLEEDING_EDGE),-$(BLEEDING_EDGE),)$(VERSUFFIX)$(if \
-                $(HEADLESS),_headless,)$(if $(DEBUG),_dbg,)
+                $(HEADLESS),~headless,)$(if $(DEBUG),~dbg,)
 archdir  := $(prefix)/opt/VirtualBox-$(ver)
 endif
@@ -81 +81 @@
 
 # shipping Linux kernel modules with bleeding-edge releases doesn't make sense
-instmod := $(if $(filter _Ubuntu_lucid _Debian_sid,$(debrel)),,1)
+instmod := $(if $(filter _Ubuntu_lucid _Ubuntu_maverick _Ubuntu_natty _Debian_sid,$(debrel)),,1)
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -90 +90 @@
 endif
 
-# Locations of custom built Qt libraries (see below)
-qtstdc5  := /home/vbox/Qt-4.4.3-stdc++5-$(arch)
+# Location of custom built Qt libraries (see below)
 qtstdc6  := /home/vbox/Qt-4.4.3-stdc++6-$(arch)