← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty-updates

« back to all changes in this revision

Viewing changes to src/VBox/Additions/linux/sharedfolders/Makefile.kmk

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-10-15 02:12:28 UTC
  • mfrom: (0.3.10 upstream) (0.4.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015021228-5e6vbxgtes8mg189
Tags: 3.2.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - VirtualBox should go in Accessories, not in System tools.
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized
  variables. Thanks to Lubomir Rintel <lkundrak@v3.sk> for the patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/linux/sharedfolders/Makefile.kmk
4
4
#
5
5
 
6
6
#
7
 
# Copyright (C) 2006-2007 Oracle Corporation
 
7
# Copyright (C) 2006-2010 Oracle Corporation
8
8
#
9
9
# This file is part of VirtualBox Open Source Edition (OSE), as
10
10
# available from http://www.virtualbox.org. This file is free software;
32
32
vboxsf-mod_INST        = $(INST_ADDITIONS)src/vboxsf/
33
33
vboxsf-mod_MODE        = a+r,u+w
34
34
vboxsf-mod_SOURCES     = $(subst ",,$(FILES_VBOXSF_NOBIN))
35
 
vboxsf-mod_SOURCES    += $(if $(VBOX_OSE),,\
36
 
                            $(PATH_vboxsf-mod)/dkms.conf)
37
 
vboxsf-mod_CLEAN      += $(PATH_vboxsf-mod)/dkms.conf
38
35
 
39
36
vboxsf-sh_INST        = $(INST_ADDITIONS)src/vboxsf/
40
37
vboxsf-sh_MODE        = a+rx,u+w
100
97
        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxsf;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" --output $@ $<
101
98
        $(QUIET)chmod 0755 $@
102
99
 
103
 
$$(PATH_vboxsf-mod)/dkms.conf: \
104
 
                $(PATH_SUB_CURRENT)/dkms.conf \
105
 
                $(VBOX_VERSION_STAMP) \
106
 
                | $$(dir $$@)
107
 
        $(call MSG_TOOL,Creating,,$@)
108
 
        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $<
109
 
 
110
100
include $(KBUILD_PATH)/subfooter.kmk
111
101