From 43077dbd490d267770ee785e6aa99e20c4c142a2 Mon Sep 17 00:00:00 2001
From: olegart <oleg@olegart.ru>
Date: Sun, 31 Jan 2016 14:41:06 +0300
Subject: [PATCH] Fix setup

---
 MANIFEST.in |  4 ++++
 setup.py    | 13 +++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 MANIFEST.in

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..ad9f9d4
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,4 @@
+include setup.cfg
+include setup.py
+include LICENSE
+recursive-include gerbmerge *.py
diff --git a/setup.py b/setup.py
index d3b62cb..db6c7da 100644
--- a/setup.py
+++ b/setup.py
@@ -39,17 +39,18 @@ if sys.platform == 'win32' or ('bdist_wininst' in sys.argv):
 else:
   # try to find the library location on this platform
   DestLib = None
-  if DestLib == None: DestLib = distutils.sysconfig.get_config_var('LIBPYTHON')
-  if DestLib == None: DestLib = distutils.sysconfig.get_config_var('LIBDEST')
+  if DestLib == None: DestLib = distutils.sysconfig.get_python_lib()
   DestDir = os.path.join(DestLib, 'gerbmerge')
   BinFiles = ['misc/gerbmerge']
   BinDir = distutils.sysconfig.get_config_var('BINDIR')  
 
   # Create top-level invocation program
+  if not os.path.exists('misc'):
+    os.makedirs('misc')
   fid = file('misc/gerbmerge', 'wt')
   fid.write( \
   r"""#!/bin/sh
-python %s/site-packages/gerbmerge/gerbmerge.py $*
+python %s/gerbmerge/gerbmerge.py $*
   """ % DestLib)
   fid.close()
 
@@ -72,9 +73,9 @@ For more details on installation or running GerbMerge, see the
 URL below.
 """,
        description = "Merge multiple Gerber/Excellon files",
-       author = "ProvideYourOwn.com",
-       author_email = "",
-       url = "https://github.com/provideyourown/gerbmerge",
+       author = "Unwired Devices LLC",
+       author_email = "info@unwds.com",
+       url = "https://github.com/unwireddevices/gerbmerge",
        packages = ['gerbmerge'],
        platforms = ['all'],
        data_files = [ (DestDir, AuxFiles),