Changeset 25204 in vbox

Timestamp:

Dec 4, 2009 8:01:25 PM (15 years ago)

Author:

vboxsync

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

55685

Message:

Additions/linux/installer: remove some unneeded files and put copies of the init scripts under /usr/lib/VBoxGuestAdditions

File:

• trunk/src/VBox/Additions/linux/Makefile.kmk (modified) (4 diffs)

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

@@ -137 +137 @@
 
 VBOX_ADD_MOD.linux = \
-        vboxadd-service.sh \
         98vboxadd-xclient \
-        vboxadd.sh \
-        x11config-new.pl \
-        routines.sh
+        x11config-new.pl
 
 VBOX_ADD_STRIP_OBJ.linux = \
@@ -183 +180 @@
         $(addprefix $(VBOX_LNX_ADD_INST_MOD_DIR),$(VBOX_LNX_ADD_STRIP_OBJ)) \
         $(addprefix $(VBOX_LNX_ADD_INST_KMOD_DIR),$(VBOX_LNX_ADD_KMOD_VERSIONED)) \
-        $(addprefix $(VBOX_LNX_ADD_INST_INIT_DIR),$(VBOX_LNX_ADD_INIT))
+        $(addprefix $(VBOX_LNX_ADD_INST_INIT_DIR),$(VBOX_LNX_ADD_INIT)) \
+        $(addprefix $(VBOX_LNX_ADD_INST_MOD_DIR),$(VBOX_LNX_ADD_INIT))
 
 VBOX_LNX_ADD_DBG_FILES := \
@@ -281 +279 @@
         $(QUIET)cp -af $< $@
 
+# pattern rule for copying the VBOX_LNX_ADD_INIT files to the module directory
+$(addprefix $(VBOX_LNX_ADD_INST_MOD_DIR),$(VBOX_LNX_ADD_INIT)): \
+                $(VBOX_LNX_ADD_INST_MOD_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@)
+        $(call MSG_INST_FILE,$<,$@)
+# Remove target directories first, otherwise the behaviour of cp will not be
+# what we want if it already exists. See the cp manual page for more details.
+        $(QUIET)$(RM) -Rf $@
+        $(QUIET)cp -af $< $@
+
 
 INSTALLS += GuestDrivers-src
@@ -293 +300 @@
  lnx_add_inst-exec_MODE = a+rx,u+w
  lnx_add_inst-exec_SOURCES = \
-        $(VBOX_REL_LNX_ADD_INST)vboxadd-service.sh \
         $(VBOX_REL_X11_ADD_INST)98vboxadd-xclient \
-        $(VBOX_REL_LNX_ADD_INST)vboxadd.sh \
-        $(VBOX_REL_X11_ADD_INST)x11config-new.pl \
-        $(VBOX_REL_LNX_INST_SRC)routines.sh
+        $(VBOX_REL_X11_ADD_INST)x11config-new.pl