Reorganize setup.py

setup.py

@@ -1,7 +1,7 @@
+import os
 import platform
 import subprocess
 import sys
-from os import getenv, path
 from setuptools import Extension
 from setuptools import setup
 
@@ -21,24 +21,27 @@ def poppler_cpp_at_least(version):
 
 include_dirs = None
 library_dirs = None
+
+# On some BSDs, poppler is in /usr/local, which is not searched by default
 if platform.system() in ["Darwin", "FreeBSD", "OpenBSD"]:
-    # On some BSDs, poppler is in /usr/local, which is not searched by default
     include_dirs = ["/usr/local/include"]
     library_dirs = ["/usr/local/lib"]
-elif platform.system() in ["Windows"]:
-    conda_prefix = getenv("CONDA_PREFIX")
+
+# On Windows, only building with conda is supported so far
+if platform.system() == "Windows":
+    conda_prefix = os.getenv("CONDA_PREFIX")
     if conda_prefix is not None:
-        include_dirs = [path.join(conda_prefix, "Library\include")]
-        library_dirs = [path.join(conda_prefix, "Library\lib")]
+        include_dirs = [os.path.join(conda_prefix, "Library\include")]
+        library_dirs = [os.path.join(conda_prefix, "Library\lib")]
 
-macros = [("POPPLER_CPP_AT_LEAST_0_30_0", int(poppler_cpp_at_least("0.30.0")))]
+extra_compile_args = ["-Wall"]
 
 # On macOS, some distributions of python build extensions for 10.6 by default,
 # but poppler uses C++11 features that require at least 10.9
 if platform.system() == "Darwin":
-    extra_compile_args = ["-Wall", "-mmacosx-version-min=10.9"]
-else:
-    extra_compile_args = ["-Wall"]
+    extra_compile_args += ["-mmacosx-version-min=10.9"]
+
+macros = [("POPPLER_CPP_AT_LEAST_0_30_0", int(poppler_cpp_at_least("0.30.0")))]
 
 module = Extension(
     "pdftotext",