Ticket #21468: apbs.diff

configure

@@ -22073 +22073 @@
                         ;;
                 darwin**)
                         PY_CC=${F77}
-                        PY_LINKFLAGS="-Wl,-framework -Wl,Python -shared"
+                        PY_LINKFLAGS="-Wl,-framework -Wl,Python -bundle"
                         PY_LDFLAGS="-Wl,-framework -Wl,Accelerate"
                         ;;
                 mingw*)
@@ -22359 +22359 @@
 
 SERVICEURL='http://ws.nbcr.net/opal/services/APBS_1.1.0'
 PARALLELSERVICEURL='http://ws.nbcr.net/opal/services/APBS_Parallel_1.1.0'
-SITEPKGS=${prefix}/lib/python${PY_VERSION}/site-packages
+SITEPKGS=@PYTHON_PKGD@
 
 sed -e 's%@SITEPKGS@%'${SITEPKGS}'%' \
     -e 's%@PACKAGE_VERSION@%'${PACKAGE_VERSION}'%' \

tools/python/Makefile.in

@@ -52 +52 @@
         ${top_builddir}/bin/.libs/libapbsmainroutines.a \
         ${top_builddir}/src/aaa_lib/.libs/libapbs.a \
         ${top_builddir}/contrib/lib/libmaloc.a \
-        ${top_builddir}/contrib/blas/.libs/libapbsblas.a \
         $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(top_builddir)/src/aaa_inc@am__isrc@
 depcomp =
@@ -235 +234 @@
 SUBDIRS = vgrid 
 _apbslib_so_SOURCES = apbslib.c
 _apbslib_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED)
-_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a ${top_builddir}/contrib/blas/.libs/libapbsblas.a $(PY_LDFLAGS)
+_apbslib_so_LDADD = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a $(PY_LDFLAGS)
 all: all-recursive
 
 .SUFFIXES:

bin/Makefile.in

@@ -563 +563 @@
         uninstall-includeHEADERS uninstall-libLTLIBRARIES
 
 
-install-data-local:
-        -cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin
-        -chmod 755 ${prefix}/bin/ApbsClient.py
-        -rm -f ${prefix}/bin/wsdl2py 
+#install-data-local:
+#       -cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin
+#       -chmod 755 ${prefix}/bin/ApbsClient.py
+#       -rm -f ${prefix}/bin/wsdl2py 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: