Changeset 33430 in vbox

Timestamp:

Oct 25, 2010 2:59:00 PM (14 years ago)

Author:

vboxsync

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

67020

Message:

Additions/linux/installer: use the shell script xorg.conf hacking script

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile.kmk (modified) (2 diffs)
• installer/vboxadd-x11.sh (modified) (2 diffs)

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

@@ -150 +150 @@
 VBOX_ADD_MOD.linux = \
         98vboxadd-xclient \
-        x11config-new.pl
+        x11config.sh
 
 VBOX_ADD_STRIP_OBJ.linux = \
@@ -305 +305 @@
 lnx_add_inst-exec_SOURCES = \
         $(VBOX_REL_X11_ADD_INST)98vboxadd-xclient \
-        $(VBOX_REL_X11_ADD_INST)x11config-new.pl
+        $(VBOX_REL_X11_ADD_INST)x11config.sh
 
 

trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh

@@ -441 +441 @@
                         generated="$generated  `printf "$i\n"`"
                     else
-                        "$lib_dir/x11config-new.pl" $newmouse $automouse $nopsaux "$i"
+                        "$lib_dir/x11config.sh" $newmouse $automouse $nopsaux "$i"
                     fi
                     configured="true"
@@ -455 +455 @@
             if test -z "$configured"; then
                 touch "$main_cfg"
-                "$lib_dir/x11config-new.pl" $newmouse $automouse $nopsaux --noBak "$main_cfg"
+                "$lib_dir/x11config.sh" $newmouse $automouse $nopsaux --noBak "$main_cfg"
                 touch "$nobak"
             fi