Merge pull request #91 from bewest/bewest/dev

dev branch
openaps · May 19, 2015 · 5f224e0 · 5f224e0
2 parents 5c94e61 + 0e12a64
commit 5f224e0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ test:
 
 install:
 	python setup.py develop
-	install 80-medtronic-carelink.rules /etc/udev/rules.d/
+	install decocare/etc/80-medtronic-carelink.rules /etc/udev/rules.d/
 	udevadm control --reload-rules
 
 ci-install:

diff --git a/80-medtronic-carelink.rules → decocare/etc/80-medtronic-carelink.rules b/80-medtronic-carelink.rules → decocare/etc/80-medtronic-carelink.rules
diff --git a/setup.py b/setup.py
@@ -4,18 +4,13 @@
 import platform
 
 import decocare
+
 def readme():
     with open("README.markdown") as f:
         return f.read()
 
-dataFiles = [ ]
-if platform.system( ) == 'Linux':
-  dataFiles = [
-      ('/etc/udev/rules.d', ['80-medtronic-carelink.rules' ]),
-    ]
-
 setup(name='decocare',
-    version='0.0.13', # http://semver.org/
+    version='0.0.14', # http://semver.org/
     description='Audit, inspect, and command MM insulin pumps.',
     long_description=readme(),
     author="Ben West",
@@ -46,7 +41,9 @@ def readme():
         'Topic :: Software Development :: Libraries'
     ],
     include_package_data=True,
-    data_files=dataFiles,
+    package_data = {
+      'decocare': ['etc/*.rules']
+    },
     zip_safe=False
 )