Changeset 63900 in vbox

Timestamp:

Sep 19, 2016 6:43:10 PM (8 years ago)

Author:

vboxsync

Message:

bugref:3809: Linux installer maintenance: install our Additions init scripts directly using an install target.

File:

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

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

@@ -292 +292 @@
         $(QUIET)$(CP) -RPf -- $< $@
 
-# pattern rule for copying the VBOX_LNX_ADD_INIT files to the installation directory
-$(addprefix $(VBOX_LNX_ADD_INST_INIT_DIR),$(VBOX_LNX_ADD_INIT)): \
-                $(VBOX_LNX_ADD_INST_INIT_DIR)% : $(PATH_STAGE_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) -RPf -- $< $@
-
 INSTALLS += GuestDrivers-src
 GuestDrivers-src_INST = $(INST_ADDITIONS)src/
@@ -354 +345 @@
 #
 INSTALLS += LnxAdd-init-scripts
-LnxAdd-init-scripts_INST = $(INST_ADDITIONS)
+LnxAdd-init-scripts_INST         = $(VBOX_LNX_ADD_INST_INIT_DIR)
+LnxAdd-init-scripts_INSTTYPE     = stage
 LnxAdd-init-scripts_EXEC_SOURCES = \
         $(foreach i,$(VBOX_LNX_ADD_INIT), installer/$(i).sh=>$(i))
-
 
 # this file needs editing before it can be included in the generic installer.