Ticket #21468: apbs.2.diff

File apbs.2.diff, 2.3 KB (added by howarth@…, 15 years ago)

reduced patch

  • configure

    old new  
    2207322073                        ;;
    2207422074                darwin**)
    2207522075                        PY_CC=${F77}
    22076                         PY_LINKFLAGS="-Wl,-framework -Wl,Python -shared"
     22076                        PY_LINKFLAGS="-Wl,-framework -Wl,Python -bundle"
    2207722077                        PY_LDFLAGS="-Wl,-framework -Wl,Accelerate"
    2207822078                        ;;
    2207922079                mingw*)
     
    2235922359
    2236022360SERVICEURL='http://ws.nbcr.net/opal/services/APBS_1.1.0'
    2236122361PARALLELSERVICEURL='http://ws.nbcr.net/opal/services/APBS_Parallel_1.1.0'
    22362 SITEPKGS=${prefix}/lib/python${PY_VERSION}/site-packages
     22362SITEPKGS=@PYTHON_PKGD@
    2236322363
    2236422364sed -e 's%@SITEPKGS@%'${SITEPKGS}'%' \
    2236522365    -e 's%@PACKAGE_VERSION@%'${PACKAGE_VERSION}'%' \
  • tools/python/Makefile.in

    old new  
    5252        ${top_builddir}/bin/.libs/libapbsmainroutines.a \
    5353        ${top_builddir}/src/aaa_lib/.libs/libapbs.a \
    5454        ${top_builddir}/contrib/lib/libmaloc.a \
    55         ${top_builddir}/contrib/blas/.libs/libapbsblas.a \
    5655        $(am__DEPENDENCIES_1)
    5756DEFAULT_INCLUDES = -I. -I$(top_builddir)/src/aaa_inc@am__isrc@
    5857depcomp =
     
    235234SUBDIRS = vgrid
    236235_apbslib_so_SOURCES = apbslib.c
    237236_apbslib_so_LINK = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED)
    238 _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)
     237_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)
    239238all: all-recursive
    240239
    241240.SUFFIXES:
  • bin/Makefile.in

    old new  
    563563        uninstall-includeHEADERS uninstall-libLTLIBRARIES
    564564
    565565
    566 install-data-local:
    567         -cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin
    568         -chmod 755 ${prefix}/bin/ApbsClient.py
    569         -rm -f ${prefix}/bin/wsdl2py
     566#install-data-local:
     567#       -cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin
     568#       -chmod 755 ${prefix}/bin/ApbsClient.py
     569#       -rm -f ${prefix}/bin/wsdl2py
    570570# Tell versions [3.59,3.63) of GNU make to not export all variables.
    571571# Otherwise a system limit (for SysV at least) may be exceeded.
    572572.NOEXPORT: