← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to hgfsmounter/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
hgfsmounter/Makefile.am
18
18
sbin_PROGRAMS = mount.vmhgfs
19
19
 
20
20
mount_vmhgfs_LDADD =
21
 
mount_vmhgfs_LDADD += ../lib/misc/libMisc.la
22
21
mount_vmhgfs_LDADD += ../lib/string/libString.la
23
22
mount_vmhgfs_LDADD += ../lib/panicDefault/libPanicDefault.la
24
23
mount_vmhgfs_LDADD += ../lib/panic/libPanic.la
 
24
mount_vmhgfs_LDADD += ../lib/lock/libLock.la
 
25
mount_vmhgfs_LDADD += ../lib/misc/libMisc.la
25
26
mount_vmhgfs_LDADD += ../lib/stubs/libStubs.la
26
27
 
27
28
mount_vmhgfs_SOURCES =
28
29
mount_vmhgfs_SOURCES += hgfsmounter.c
29
 
mount_vmhgfs_SOURCES += stub-user-util.c
30
30
 
31
31
if FREEBSD
32
32
install-exec-hook:
33
33
        mv $(DESTDIR)$(sbindir)/mount.vmhgfs \
34
34
                $(DESTDIR)$(sbindir)/mount_vmhgfs
35
 
if WITH_ROOT_PRIVILEGES
36
 
        chmod u+s $(DESTDIR)$(sbindir)/mount_vmhgfs
37
 
endif WITH_ROOT_PRIVILEGES
38
35
        -$(MKDIR_P) $(DESTDIR)/sbin
39
36
        -$(LN_S) $(DESTDIR)$(sbindir)/mount_vmhgfs \
40
37
                $(DESTDIR)/sbin/mount_vmhgfs &> /dev/null
42
39
        rm -f $(DESTDIR)$(sbindir)/mount_vmhgfs
43
40
else
44
41
install-exec-hook:
45
 
if WITH_ROOT_PRIVILEGES
46
 
        chmod u+s $(DESTDIR)$(sbindir)/mount.vmhgfs
47
 
endif WITH_ROOT_PRIVILEGES
48
42
        -$(MKDIR_P) $(DESTDIR)/sbin
49
43
        -$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
50
44
                $(DESTDIR)/sbin/mount.vmhgfs &> /dev/null