Merge pull request #479 from diabonas/apparmor-additions

[torbrowser-launcher.git] / setup.py

diff --git a/setup.py b/setup.py
index 37452ba06fcef82a943a81bdd162a874cdacbcd8..a79d3b39898806c3b76c2a6f5757469fc3f4b58a 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -71,8 +71,8 @@ with open(os.path.join(SHARE, 'torbrowser-launcher/version')) as buf:
 
 datafiles = []
 for root, dirs, files in os.walk(SHARE):
-    datafiles.append((os.path.join(sys.prefix, root),
-                      [os.path.join(root, f) for f in files]))
+    if files:
+        datafiles.append((root, [os.path.join(root, f) for f in files]))
 
 # disable shipping apparmor profiles until they work in ubuntu (#128)
 if distro != 'Ubuntu':
@@ -81,16 +81,14 @@ if distro != 'Ubuntu':
         datafiles += [
             ('/etc/apparmor.d/', [
                 'apparmor/torbrowser.Browser.firefox',
-                'apparmor/torbrowser.Browser.plugin-container',
                 'apparmor/torbrowser.Tor.tor']),
             ('/etc/apparmor.d/local/', [
                 'apparmor/local/torbrowser.Browser.firefox',
-                'apparmor/local/torbrowser.Browser.plugin-container',
                 'apparmor/local/torbrowser.Tor.tor']),
             ('/etc/apparmor.d/tunables/', ['apparmor/tunables/torbrowser'])
         ]
 
-datafiles += [('/usr/share/locale/', create_mo_files())]
+datafiles += [(os.path.dirname(f), [f]) for f in create_mo_files()]
 
 setup(
     name='torbrowser-launcher',