# ChangeLog for sci-libs/ccp4-libs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.6 2010/05/22 10:04:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.7 2010/06/29 19:55:41 jlec Exp $
+
+*ccp4-libs-6.1.3-r3 (29 Jun 2010)
+
+ 29 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/6.1.3-destdir.patch,
+ files/6.1.3-dont-build-mmdb.patch, +files/6.1.3-noinstall.patch,
+ +ccp4-libs-6.1.3-r3.ebuild:
+ Change way of installation, fixed insecure runpaths
*ccp4-libs-6.1.3-r2 (22 May 2010)
AUX 6.0.2-ppc-double-define-gerror.patch 424 RMD160 4f012233446fffa61e8d775a19a0dacea4ae2234 SHA1 209fa1bdf1e59b4055177e343b69e487d9183fb3 SHA256 09c2c1e0176bee94673b21609b2b00118b2bb4f5942f3feb35c64c61c99ebc61
AUX 6.1.3-ccif-shared.patch 1668 RMD160 803687b13dbe93aaeed8264a73dfe7303b5fcdfb SHA1 3d833aefea874c08e61140613b0a5c75a90e0382 SHA256 57c201ee81e3fd95f174fecfd810ddf12509f0c2bfb1b2f317f893561eb60e3f
-AUX 6.1.3-dont-build-mmdb.patch 861 RMD160 f2cfce178bb421c36e1b1114435f8e0ee97102d8 SHA1 d39439dfd9c23781a232551ef9690df6f9ea7681 SHA256 fb4711188e41e6be0a86464425fd9b04ae5dba58fb00202c7234182d002dc795
+AUX 6.1.3-destdir.patch 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+AUX 6.1.3-dont-build-mmdb.patch 324 RMD160 b9ad1f72415d7a95fba58d07440c19c78062ddb6 SHA1 4d53ff4106b4ff216def790177801f1c50da8cce SHA256 06d4bf3ee012e123f141e8dcaf1abffd9b0fbee9720f8c490d78dabe9e944f66
AUX 6.1.3-dont-make-dirs-in-configure.patch 2866 RMD160 ba49e45ab609a42a2d93b96f55af913bf9625610 SHA1 36c9329c3768c08687ef062c9ab649d32833b422 SHA256 1b5997f17526a4fd60ffa9eccf4b765aadf3a78c9394657000e0454f364240ca
AUX 6.1.3-glibc2.10.patch 1018 RMD160 577ee4a6174df36bb8bac82738523f5c757df4b9 SHA1 48ad6d0d024c43d64277e4decba420d51e75a510 SHA256 d2a2ddf2a66738d94723b50797e279f64c8e057a3e584e33f9eb9c8d7ea0e532
AUX 6.1.3-link-proberly.patch 8282 RMD160 c45d3d1931e6a083c0c96b819aff3f67873659b8 SHA1 b1be6f1f7162616a60f3e12fe02dbe4dd426e990 SHA256 f6623dfb0d270e5fbffe03f95b23c967ec8da34b3d0a1c5262941979a965f9ea
+AUX 6.1.3-noinstall.patch 5226 RMD160 6ddeaefd702fc64256f761dd9b832a1e9686a2f3 SHA1 4416be1663dceedb1d1cf511c39c706ecb8f787c SHA256 2a4a57db992ad19329ac0531ef34599c58cfcba618d92448366e84bb395a8bde
AUX 6.1.3-unbundle-libs.patch 9063 RMD160 326af0e6990134546fb2607dae707b94d4588149 SHA1 ef929532e45c12fb168e5fca4eb7fa8c857c376a SHA256 7e5fc919b5204e2d9141f7715afdd8a8b4e3e2a96e2bf95aa00fbd56046f1aa4
DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324
EBUILD ccp4-libs-6.1.3-r1.ebuild 6141 RMD160 7b49aedef260644eb31dc5581bffa58f2b452479 SHA1 70c015dc857ee9afc19bdfb8189bcae3c1f57e61 SHA256 54c6997a9ef747c29ae6e1497e83c1f2465ecb9c75cdb73b578caeb89b17dabf
EBUILD ccp4-libs-6.1.3-r2.ebuild 6141 RMD160 3b629dbda585d8391e64701fab362df0edaf4ebd SHA1 e367891a27dd68f6cc6f70f34516d80795e3623b SHA256 356863aa6ef2ed260fc57d00e95929442a816da11c93f8d1477907ba90ac73c6
+EBUILD ccp4-libs-6.1.3-r3.ebuild 6519 RMD160 088d7df31ba3376c5b10bf522a902fbce4f98ddd SHA1 6bb1b836e82aaf24030b053ea05b20a9b6f5732c SHA256 95adafa6546d9a30c1c146f44c73bf7d6054cd9bbded7aac9a5527048a14dce5
EBUILD ccp4-libs-6.1.3.ebuild 5892 RMD160 2fb6d639e3201775ba15ed8a27586b69be7707c7 SHA1 c7240c3c925042c04fd112402ac09607ae6448cf SHA256 9fe3acab2d6f59161772fcac0cf45e2150372d3cbb38f7edfafe2d6f47ab5fb8
-MISC ChangeLog 1147 RMD160 c10b89157cd1fd4eb9acbd44f98ccaa00b2f2d41 SHA1 f7aadd0b714da7e3c2af5b41e67eb1d58aa4d07c SHA256 472ed2ceccc55333a0cfbe4f43084f27c273bca9c6032dc3f07cd81951a096be
+MISC ChangeLog 1409 RMD160 990e8c89240ac175df4912a1167897eaa11370c0 SHA1 d1f9c13c980f672a62065adb9187943bcd13d93c SHA256 562bc3baac9af1456ad1a19f3208452c99e4b4ce181707760f60ca95c8d2908d
MISC metadata.xml 306 RMD160 57ba72f54388a666851bda87e52d313d618084e3 SHA1 7d2f57cb3f35eb6d4567b211e01251b5945d4eb2 SHA256 af351be5ead71b377b6fa2fa118fb9aee74129afdc19f736b41596d3033106aa
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkv3rDAACgkQgAnW8HDreRaveACgr5bFwE4rmiiKrgQtk42VlzGY
-Au0AniXt2+DeOyvbaD4BLGaG1ckQs40X
-=D6eN
+iEYEARECAAYFAkwqT8IACgkQgAnW8HDreRYWggCaArczBcox7NRpTr5DbuMvEieO
+fPYAnjkuYf+lyZj45rBeevH+p5QXb/ez
+=j0GD
-----END PGP SIGNATURE-----
--- /dev/null
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r3.ebuild,v 1.1 2010/06/29 19:55:41 jlec Exp $
+
+EAPI="3"
+
+inherit fortran eutils gnuconfig multilib toolchain-funcs
+
+FORTRAN="g77 gfortran ifc"
+
+SRC="ftp://ftp.ccp4.ac.uk/ccp4"
+
+#UPDATE="04_03_09"
+#PATCHDATE="090511"
+
+MY_P="${P/-libs}"
+
+PATCH_TOT="0"
+# Here's a little scriptlet to generate this list from the provided
+# index.patches file
+#
+# i=1; while read -a line; do [[ ${line//#} != ${line} ]] && continue;
+# echo "PATCH${i}=( ${line[1]}"; echo "${line[0]} )"; (( i++ )); done <
+# index.patches
+#PATCH1=( src/topp_
+#topp.f-r1.16.2.5-r1.16.2.6.diff )
+#PATCH2=( .
+#configure-r1.372.2.18-r1.372.2.19.diff )
+
+DESCRIPTION="Protein X-ray crystallography toolkit"
+HOMEPAGE="http://www.ccp4.ac.uk/"
+SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz"
+# patch tarball from upstream
+ [[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
+# patches created by us
+ [[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
+
+for i in $(seq $PATCH_TOT); do
+ NAME="PATCH${i}[1]"
+ SRC_URI="${SRC_URI}
+ ${SRC}/${PV}/patches/${!NAME}"
+done
+
+LICENSE="ccp4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ media-libs/jpeg:0
+ app-shells/tcsh
+ !<sci-chemistry/ccp4-6.1.3
+ sci-libs/cbflib
+ =sci-libs/fftw-2*
+ sci-libs/mmdb
+ sci-libs/monomer-db
+ virtual/lapack
+ virtual/blas"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ einfo "Applying upstream patches ..."
+ for patch in $(seq $PATCH_TOT); do
+ base="PATCH${patch}"
+ dir=$(eval echo \${${base}[0]})
+ p=$(eval echo \${${base}[1]})
+ pushd "${dir}" >& /dev/null
+ ccp_patch "${DISTDIR}/${p}"
+ popd >& /dev/null
+ done
+ einfo "Done."
+ echo
+
+ [[ -n ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
+
+ einfo "Applying Gentoo patches ..."
+ # it tries to create libdir, bindir etc on live system in configure
+ ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch
+
+ # gerror_ gets defined twice on ppc if you're using gfortran/g95
+ ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch
+
+ # make creation of libccif.so smooth
+ ccp_patch "${FILESDIR}"/${PV}-ccif-shared.patch
+
+ # lets try to build libmmdb seperatly
+ ccp_patch "${FILESDIR}"/${PV}-dont-build-mmdb.patch
+
+ # unbundle libjpeg and cbflib
+ ccp_patch "${FILESDIR}"/${PV}-unbundle-libs.patch
+
+ # Fix missing DESTIDR
+ ccp_patch "${FILESDIR}"/${PV}-destdir.patch
+
+ # not installing during build
+ ccp_patch "${FILESDIR}"/${PV}-noinstall.patch
+ sed \
+ -e '/SHARE_INST/s:$(libdir):$(DESTDIR)/$(libdir):g' \
+ -i configure || die
+
+ einfo "Done." # done applying Gentoo patches
+ echo
+
+ sed \
+ -e "s:/usr:${EPREFIX}/usr:g" \
+ -e 's:-Wl,-rpath,$CLIB::g' \
+ -e 's: -rpath $CLIB::g' \
+ -e 's: -I${srcdir}/include/cpp_c_headers::g' \
+ -i configure || die
+
+ gnuconfig_update
+}
+
+src_configure() {
+
+ rm -rf lib/DiffractionImage/{jpg,CBFlib} || die
+
+ # Build system is broken if we set LDFLAGS
+ userldflags="${LDFLAGS}"
+ export SHARED_LIB_FLAGS="${LDFLAGS}"
+ unset LDFLAGS
+
+ # GENTOO_OSNAME can be one of:
+ # irix irix64 sunos sunos64 aix hpux osf1 linux freebsd
+ # linux_compaq_compilers linux_intel_compilers generic Darwin
+ # ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers
+ if [[ "${FORTRANC}" = "ifc" ]]; then
+ if use ia64; then
+ GENTOO_OSNAME="ia64_linux_intel"
+ else
+ # Should be valid for x86, maybe amd64
+ GENTOO_OSNAME="linux_intel_compilers"
+ fi
+ else
+ # Should be valid for x86 and amd64, at least
+ GENTOO_OSNAME="linux"
+ fi
+
+ # Sets up env
+ ln -s \
+ ccp4.setup-bash \
+ "${S}"/include/ccp4.setup
+
+ # We agree to the license by emerging this, set in LICENSE
+ sed -i \
+ -e "s~^\(^agreed=\).*~\1yes~g" \
+ "${S}"/configure
+
+ # Fix up variables -- need to reset CCP4_MASTER at install-time
+ sed -i \
+ -e "s~^\(setenv CCP4_MASTER.*\)/.*~\1"${WORKDIR}"~g" \
+ -e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1${EPREFIX}/usr/bin~g" \
+ "${S}"/include/ccp4.setup*
+
+ # Set up variables for build
+ source "${S}"/include/ccp4.setup
+
+ export CC=$(tc-getCC)
+ export CXX=$(tc-getCXX)
+ export COPTIM=${CFLAGS}
+ export CXXOPTIM=${CXXFLAGS}
+ # Default to -O2 if FFLAGS is unset
+ export FC=${FORTRANC}
+ export FOPTIM=${FFLAGS:- -O2}
+# export CCP4_SCR="${T}"
+
+ # Fix linking
+# $(tc-getCC) ${userldflags} -shared -Wl,-soname,libmmdb.so -o libmmdb.so \${MMDBOBJS} $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm -lstdc++ && \
+ export SHARE_LIB="\
+ $(tc-getCC) ${userldflags} -shared -Wl,-soname,libccp4c.so -o libccp4c.so \${CORELIBOBJS} \${CGENERALOBJS} \${CUCOBJS} \${CMTZOBJS} \${CMAPOBJS} \${CSYMOBJS} -L.. -lccif $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lm && \
+ ${FORTRANC} ${userldflags} -shared -Wl,-soname,libccp4f.so -o libccp4f.so \${FORTRANLOBJS} \${FINTERFACEOBJS} -L.. -lccif -L. -lccp4c -lmmdb $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -lstdc++ -lgfortran -lm"
+
+ # Can't use econf, configure rejects unknown options like --prefix
+ ./configure \
+ --onlylibs \
+ --with-shared-libs \
+ --with-fftw="${EPREFIX}"/usr \
+ --with-warnings \
+ --disable-cctbx \
+ --disable-clipper \
+ --tmpdir="${TMPDIR}" \
+ --bindir="${EPREFIX}"/usr/libexec/ccp4/bin/ \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ ${GENTOO_OSNAME} || die "econf failed"
+}
+
+src_compile() {
+ emake -j1 \
+ DESTDIR="${ED}" onlylib || die "emake failed"
+}
+
+src_install() {
+ # Set up variables for build
+ source "${S}"/include/ccp4.setup
+
+ emake -j1 \
+ DESTDIR="${ED}" \
+ includedir="${EPREFIX}"/usr/include \
+ library_includedir="${EPREFIX}"/usr/include \
+ install || die
+
+ # Libs
+ for file in "${S}"/lib/*; do
+ if [[ -d ${file} ]]; then
+ continue
+ elif [[ -x ${file} ]]; then
+ dolib.so ${file} || die
+ else
+ insinto /usr/$(get_libdir)
+ doins ${file} || die
+ fi
+ done
+
+ # Fix libdir in all *.la files
+ sed -i \
+ -e "s:^\(libdir=\).*:\1\'${EPREFIX}/usr/$(get_libdir)\':g" \
+ "${ED}"/usr/$(get_libdir)/*.la || die
+
+ # Data
+ insinto /usr/share/ccp4/data/
+ doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures} || die
+ dodoc "${S}"/lib/data/*.doc || die
+ newdoc "${S}"/lib/data/README DATA-README || die
+}
+
+# Epatch wrapper for bulk patching
+ccp_patch() {
+ EPATCH_SINGLE_MSG=" ${1##*/} ..." epatch ${1}
+}
# maybe create shared library
$(SHARE_LIB)
---- lib/src/Makefile.in 2009-06-18 15:44:08.000000000 +0200
-+++ lib/src/Makefile.in.new 2009-08-11 12:17:53.000000000 +0200
-@@ -716,11 +716,9 @@
- rm -f $(DESTDIR)$(includedir)/mmdb/$$f; \
- done
-
--install : all install-ccp4HEADERS install-mmdbHEADERS
-- $(INSTALL_DATA) `pwd`/$(LMMDB) $(libdir)/$(LMMDB)
-+install : all install-ccp4HEADERS
- $(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC)
- $(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF)
-- $(RANLIB) $(libdir)/$(LMMDB)
- $(RANLIB) $(libdir)/$(LC)
- $(RANLIB) $(libdir)/$(LF)
- $(SHARE_INST)
--- /dev/null
+diff --git a/Makefile.in b/Makefile.in
+index ac552fe..fab1a87 100755
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -30,8 +30,7 @@ lapacklib : FORCE
+
+ cciflib : FORCE
+ if test -n "$(ccifdir)"; then cd $(ccifdir); \
+- $(MAKE) $(MFLAGS) $(MVARS); else true; fi; \
+- $(MAKE) install
++ $(MAKE) $(MFLAGS) $(MVARS); else true; fi
+
+ cctbx: FORCE
+ if test -n "$(cctbxdir)"; then cd $(top_srcdir)/$(cctbxdir); \
+@@ -40,8 +39,7 @@ cctbx: FORCE
+ libdir : FORCE lapacklib cciflib libccp4 clipper ssm diffractionImg
+
+ libccp4: FORCE
+- cd lib/src; $(MAKE) $(MFLAGS) $(MVARS) ; \
+- $(MAKE) install
++ cd lib/src; $(MAKE) $(MFLAGS) $(MVARS)
+
+ share : FORCE
+ cd share; $(MAKE) $(MFLAGS) $(MVARS)
+@@ -51,18 +49,15 @@ ccp4i : FORCE
+
+ clipper: FORCE fftw
+ if test -n "$(clipperdir)"; then cd $(top_srcdir)/lib/clipper/clipper; \
+- $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi ; \
+- $(MAKE) install
++ $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi
+
+ diffractionImg:
+ if test -n "$(diffimdir)"; then cd $(top_srcdir)/$(diffimdir); \
+- $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi ; \
+- $(MAKE) install
++ $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi
+
+ ssm:
+ if test -n "$(ssmdir)"; then cd $(top_srcdir)/$(ssmdir); \
+- $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi ; \
+- $(MAKE) install
++ $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi
+
+ fftw: FORCE
+ if test -n "$(fftwdir)"; then cd $(top_srcdir)/lib/fftw; \
+@@ -79,7 +74,7 @@ unsupported : FORCE libdir
+ $(MAKE) $(MFLAGS) $(MVARS); else true; fi
+
+ datadir : FORCE libdir
+- cd lib/data; $(MAKE) $(MFLAGS) $(MVARS)
++ cd lib/data; $(MAKE) $(MFLAGS) $(MVARS) font84.dat
+
+ xwindir : FORCE libdir
+ if test -f x-windows/Makefile; then cd x-windows; \
+diff --git a/lib/ccif/Makefile.in b/lib/ccif/Makefile.in
+index 975f1d9..75eda9f 100755
+--- a/lib/ccif/Makefile.in
++++ b/lib/ccif/Makefile.in
+@@ -371,11 +371,11 @@ condition.h condition_list.h: $(srcdir)/condition.list $(srcdir)/condition.awk
+ #
+
+ install : all
+- $(INSTALL_DATA) `pwd`/$L $(libdir)/$L
+- $(INSTALL_DATA) `pwd`/$(CIFMMLIB) $(libdir)/$(CIFMMLIB)
+- $(RANLIB) $(libdir)/$L
++ $(RANLIB) $L
++ $(INSTALL_DATA) `pwd`/$L $(DESTDIR)/$(libdir)/$L
++ $(INSTALL_DATA) `pwd`/$(CIFMMLIB) $(DESTDIR)$(libdir)/$(CIFMMLIB)
+ if (test -f $(SHARED_LIB_NAME)); then \
+- $(INSTALL_DATA) `pwd`/$(SHARED_LIB_NAME) $(libdir)/$(SHARED_LIB_NAME); \
++ $(INSTALL_DATA) `pwd`/$(SHARED_LIB_NAME) $(DESTDIR)/$(libdir)/$(SHARED_LIB_NAME); \
+ fi
+
+ uninstall :
+diff --git a/lib/data/Makefile.in b/lib/data/Makefile.in
+index cc25c5c..7445ca5 100755
+--- a/lib/data/Makefile.in
++++ b/lib/data/Makefile.in
+@@ -30,9 +30,9 @@ font84.dat : fontpack $(srcdir)/font84.ascii
+
+ install : all
+ -rm -f font84.dat
+- test -f font84.ascii || $(LNS) $(srcdir)/font84.ascii .
++ test -f font84.ascii || $(LNS) $(DESTIDIR)/$(srcdir)/font84.ascii .
+ ./fontpack
+- $(INSTALL) `pwd`/font84.dat $(libdir)/font84.dat
++ $(INSTALL) `pwd`/font84.dat $(DESTDIR)/$(libdir)/font84.dat
+
+ uninstall :
+ -rm -f $(libdir)/font84.dat
+diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in
+index c23f488..3a611f1 100755
+--- a/lib/src/Makefile.in
++++ b/lib/src/Makefile.in
+@@ -685,7 +685,7 @@ testlib : $(srcdir)/testlib.f $(LF)
+ #
+
+ install-ccp4HEADERS: $(ccp4_HEADERS)
+- if test ! -d $(DESTDIR)$(includedir)/ccp4; then mkdir $(DESTDIR)$(includedir)/ccp4; fi
++ if test ! -d $(DESTDIR)$(includedir)/ccp4; then mkdir -p $(DESTDIR)$(includedir)/ccp4; fi
+ @list='$(ccp4_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+@@ -716,13 +716,11 @@ uninstall-mmdbHEADERS:
+ rm -f $(DESTDIR)$(includedir)/mmdb/$$f; \
+ done
+
+-install : all install-ccp4HEADERS install-mmdbHEADERS
+- $(INSTALL_DATA) `pwd`/$(LMMDB) $(libdir)/$(LMMDB)
+- $(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC)
+- $(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF)
+- $(RANLIB) $(libdir)/$(LMMDB)
+- $(RANLIB) $(libdir)/$(LC)
+- $(RANLIB) $(libdir)/$(LF)
++install : all install-ccp4HEADERS
++ $(RANLIB) $(LC)
++ $(RANLIB) $(LF)
++ $(INSTALL_DATA) `pwd`/$(LC) $(DESTDIR)/$(libdir)/$(LC)
++ $(INSTALL_DATA) `pwd`/$(LF) $(DESTDIR)/$(libdir)/$(LF)
+ $(SHARE_INST)
+
+ uninstall : uninstall-ccp4HEADERS uninstall-mmdbHEADERS
+diff --git a/lib/ssm/Makefile.in b/lib/ssm/Makefile.in
+index 27d3aa2..0a14fe5 100755
+--- a/lib/ssm/Makefile.in
++++ b/lib/ssm/Makefile.in
+@@ -375,12 +375,12 @@ distclean-libtool:
+ uninstall-info-am:
+ install-library_includeHEADERS: $(library_include_HEADERS)
+ @$(NORMAL_INSTALL)
+- test -z "$(library_includedir)" || $(mkdir_p) "$(DESTDIR)$(library_includedir)"
++ test -z "$(library_includedir)" || $(mkdir_p) "$(DESTDIR)$(library_includedir)/ssm"
+ @list='$(library_include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+- echo " $(library_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(library_includedir)/$$f'"; \
+- $(library_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(library_includedir)/$$f"; \
++ echo " $(library_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(library_includedir)/ssm/$$f'"; \
++ $(library_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(library_includedir)/ssm/$$f"; \
+ done
+
+ uninstall-library_includeHEADERS:
projects / gentoo.git / commitdiff