--- setup.py.old	2009-07-15 08:29:35.000000000 -0800
+++ setup.py	2009-07-15 09:33:45.000000000 -0800
@@ -45,6 +45,9 @@
                                  "Lib/site-packages/numpy/core/include")]
     else:
         arrayobject_h_include = [os.path.join(sys.prefix,
+                                "lib64/python%s.%s/site-packages/numpy/core/include"
+                                % sys.version_info [:2]),
+                                os.path.join(sys.prefix,
                                 "lib/python%s.%s/site-packages/numpy/core/include"
                                 % sys.version_info [:2])]
 
@@ -75,13 +78,25 @@
         netcdf_prefix=os.environ['NETCDF_PREFIX']
     except KeyError:
         pass
+netcdf_include=None
+netcdf_lib=None
 if netcdf_prefix is None:
     for netcdf_prefix in ['/usr/local', '/usr', '/sw']:
-        netcdf_include = os.path.join(netcdf_prefix, 'include')
-        netcdf_lib = os.path.join(netcdf_prefix, 'lib')
-        if os.path.exists(os.path.join(netcdf_include, 'netcdf.h')):
-            break
-    else:
+      for netcdf_postfix in ['', 'netcdf', 'netcdf-3']:
+        netcdf_include = os.path.join(netcdf_prefix, 'include',netcdf_postfix)
+        for arch_lib in ['lib64', 'lib']:
+             netcdf_lib = os.path.join(netcdf_prefix, arch_lib)
+             if os.path.exists(os.path.join(netcdf_include, 'netcdf.h')):
+                 break
+             else:
+               arch_lib = None
+        if arch_lib is not None:
+          break
+        else:
+          netcdf_postfix = None
+      if netcdf_postfix is not None:
+        break
+      else:
         netcdf_prefix = None
 
 if netcdf_prefix is None:
@@ -105,9 +120,9 @@
         options['bdist_wininst'] = {'install_script': "scientific_win32_postinstall.py"}
     else:
         print "Using netCDF installation in ", netcdf_prefix
-        netcdf_include = os.path.join(netcdf_prefix, 'include')
-        netcdf_h_file = os.path.join(netcdf_prefix, 'include', 'netcdf.h')
-        netcdf_lib = os.path.join(netcdf_prefix, 'lib')
+        if netcdf_include == None: netcdf_include = os.path.join(netcdf_prefix, 'include')
+        netcdf_h_file = os.path.join(netcdf_include, 'netcdf.h')
+        if netcdf_lib==None: netcdf_lib = os.path.join(netcdf_prefix, 'lib')
     ext_modules = [Extension('Scientific_netcdf',
                              ['Src/Scientific_netcdf.c'],
                              include_dirs=['Include', netcdf_include]