Ticket #27906: apbs.diff

configure

@@ -22371 +22371 @@
 
 SERVICEURL='http://kryptonite.nbcr.net/opal2/services/apbs_1.3'
 PARALLELSERVICEURL='http://oolite.calit2.optiputer.net/opal2/services/apbs-parallel-1.3'
-SITEPKGS=${prefix}/lib/python${PY_VERSION}/site-packages
+SITEPKGS=@PYTHON_PKGD@
 
 
 # Check whether --with-maxmem was given.

bin/Makefile.in

@@ -590 +590 @@
 rm.apbs: Makefile
         -rm -f apbs
 
-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:

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) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(top_builddir)/src/aaa_inc@am__isrc@
 depcomp =
@@ -248 +247 @@
 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) ${z_lib} 
+_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) ${z_lib} 
 all: all-recursive
 
 .SUFFIXES: