3 files changed, 8 insertions, 6 deletions
diff --git a/src/setup-dbg.py b/src/setup-dbg.py
index 4077eaf..9602abc 100644
--- a/src/setup-dbg.py
+++ b/src/setup-dbg.py
@@ -27,15 +27,13 @@
 #
 
 from distutils.core import setup, Extension
-from distutils.sysconfig import get_python_lib
 from setup_common import *
 
 #
 #  Some default values
 #
 incdir = []
-#. XXX: Debian Workaound: libdir = [get_python_lib(1), "/usr/lib/pymodules/python%d.%d"%sys.version_info[0:2]]
-libdir = [get_python_lib(1)]
+libdir = []
 libs = []
 
 # Get libxml2 info
diff --git a/src/setup.py b/src/setup.py
index 96b6133..d33db64 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -27,15 +27,13 @@
 #
 
 from distutils.core import setup, Extension
-from distutils.sysconfig import get_python_lib
 from setup_common import *
 
 #
 #  Some default values
 #
 incdir = []
-#. XXX: Debian Workaound: libdir = [get_python_lib(1), "/usr/lib/pymodules/python%d.%d"%sys.version_info[0:2]]
-libdir = [get_python_lib(1)]
+libdir = []
 libs = []
 
 # Get libxml2 info
diff --git a/src/setup_common.py b/src/setup_common.py
index e55bf4f..fdf5c8c 100644
--- a/src/setup_common.py
+++ b/src/setup_common.py
@@ -27,6 +27,8 @@
 #
 
 import commands, sys
+from os import path as os_path
+from distutils.sysconfig import get_python_lib
 
 # libxml2 - C flags
 def libxml2_include(incdir):
@@ -46,6 +48,10 @@ def libxml2_include(incdir):
 
 # libxml2 - library flags
 def libxml2_lib(libdir, libs):
+    libdir.append(get_python_lib(1))
+    if os_path.exists("/etc/debian_version"): #. XXX: Debian Workaround...
+        libdir.append("/usr/lib/pymodules/python%d.%d"%sys.version_info[0:2])
+
     (res, libxml2_libs) = commands.getstatusoutput("xml2-config --libs")
     if res != 0:
         print "Could not build python-dmidecode."