Changeset 16129 in vbox

Timestamp:

Jan 21, 2009 11:47:45 AM (16 years ago)

Author:

vboxsync

Message:

deb: some webservices tweaks

File:

• trunk/debian/rules (modified) (3 diffs)

trunk/debian/rules

@@ -69 +69 @@
 
 # Ubuntu dapper: gcc-4.0 does not work with recompiler, use gcc-3.4 instead
+# Ubuntu gutsy:  gcc-4.1 does not work for the webservices, use gcc-4.2 instead
 configure: debian/configure-stamp
 debian/configure-stamp:
@@ -76 +77 @@
             $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) $(if \
             $(filter _Ubuntu_dapper,$(debrel)),--with-gcc=gcc-3.4 --with-g++=g++-3.4,) $(if \
+            $(filter _Ubuntu_gutsy,$(debrel)),--with-gcc=gcc-4.2 --with-g++=g++-4.2,) $(if \
             $(filter _xandros4.1 _ucs1.3,$(debrel)),--disable-sdl-ttf,) $(if \
             $(HEADLESS),--build-headless,) $(if $(DEBUG),--build-debug,)
@@ -184 +186 @@
         mv $(archdir)/VBoxSysInfo.sh $(prefix)/usr/share/$(package)
         for i in VBoxManage VBoxSVC $(if $(HEADLESS),,VBoxSDL) \
-            $(if $(NOQT),,VirtualBox) \
-            VBoxHeadless $(if $(ose),,vboxwebsrv webtest); do \
+            $(if $(NOQT),,VirtualBox) VBoxHeadless; do \
             mv $(archdir)/$$i $(prefix)/usr/lib/$(package); done
+        [ -f $(archdir)/vboxwebsrv ] && mv $(archdir)/vboxwebsrv $(prefix)/usr/lib/$(package)
+        [ -f $(archdir)/webtest ] && mv $(archdir)/webtest $(prefix)/usr/lib/$(package)
         mv $(archdir)/VBoxTunctl $(prefix)/usr/bin
         $(if $(NOMODS),,for d in $(moddir)/*; do \