fix to src_install

2 files changed, 19 insertions, 61 deletions

diff --git a/dev-util/cppunit/ChangeLog b/dev-util/cppunit/ChangeLog
index 2a8728eb9a79..8d04c67a9919 100644
--- a/dev-util/cppunit/ChangeLog
+++ b/dev-util/cppunit/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for dev-util/cppunit
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/ChangeLog,v 1.1 2002/10/30 01:10:20 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/ChangeLog,v 1.2 2002/11/02 01:26:38 george Exp $
 
 *cppunit-1.8.0 (29 Oct 2002)
 
+  01 Nov 2002; George Shapovalov <george@gentoo.org> cppunit-1.8.0.ebuild :
+
+  incorporated a reworked src_install by Jeffrey Palmer <jeffrey.palmer@acm.org>
+  see #5603 for details
+
   29 Oct 2002; George Shapovalov <george@gentoo.org> cppunit-1.8.0.ebuild :
 
   initial release
diff --git a/dev-util/cppunit/cppunit-1.8.0.ebuild b/dev-util/cppunit/cppunit-1.8.0.ebuild
index 0408f6bff5ee..723d04553a42 100644
--- a/dev-util/cppunit/cppunit-1.8.0.ebuild
+++ b/dev-util/cppunit/cppunit-1.8.0.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.8.0.ebuild,v 1.1 2002/10/30 01:10:20 george Exp $
-
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.8.0.ebuild,v 1.2 2002/11/02 01:26:38 george Exp $
 
 DESCRIPTION="CppUnit is the C++ port of the famous JUnit framework for unit testing."
-
 HOMEPAGE="http://cppunit.sourceforge.net/"
 SRC_URI="http://unc.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz"
 
@@ -12,65 +10,20 @@ LICENSE="LGPL"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
 
-DEPEND="app-doc/doxygen
+DEPEND="app-doc/doxygen 
 	media-gfx/graphviz"
 
-src_compile () {
-	./configure --prefix=/usr || die
+src_compile() {
+	econf || die "./configure failed"
 	emake || die
-	#emake check || die
+	#make check || die
 }
 
-src_install () {
-	# The libs
-	insinto /usr
-	dolib ${S}/src/cppunit/.libs/libcppunit-1.8.so.0.0.0 || die
-	#the symlinks in /usr/lib should be local
-	cd ${D}/usr/lib
-	ln -sf libcppunit-1.8.so.0.0.0 libcppunit-1.8.so.0 || die
-	ln -sf libcppunit-1.8.so.0.0.0 libcppunit.so || die
-	cd ${S}
-	dolib ${S}/src/cppunit/.libs/libcppunit.a || die
-
-	# Main headers
-	dodir /usr/include
-	dodir /usr/include/cppunit
-	find src -name "*.h" -exec cp '{}' ${D}/usr/include/cppunit ';'
-
-	# The user interface headers. There's also a MFC header, but it's
-	# not as if this is ever going to be used on a 'doze box. *grin*
-	dodir /usr/include/cppunit/ui
-	dodir /usr/include/cppunit/ui/qt
-	find ${S}/src -name "*.h" -exec cp '{}' ${D}/usr/include/cppunit/ui/qt ';'
-	dodir /usr/include/cppunit/ui/text
-	find ${S}/src -name "*.h" -exec cp '{}' ${D}/usr/include/cppunit/ui/text ';'
-
-	# And extension headers
-	dodir /usr/include/cppunit/extensions
-	find ${S}/src -name "*.h" -exec cp '{}' ${D}/usr/include/cppunit/extensions ';'
-
-	# And now for the documentation
-	docinto /usr
-	dodoc ChangeLog INSTALL COPYING
-
-	dodir /usr/share/doc/${P}
-	#cp -a ${S}/doc/html ${D}/usr/share/doc/${P}
-	dohtml doc/html
-
-	# There's a two-question text FAQ as well, but it's included in the
-	# html docs and IMO not worth repeating.
-
-	# Now examples, first a 'game' example:
-	dodir /usr/share/doc/${P}/examples/hierarchy
-	cp -a ${S}/examples/hierarchy/*.cpp ${D}/usr/share/doc/${P}/examples/hierarchy
-	cp -a ${S}/examples/hierarchy/*.h ${D}/usr/share/doc/${P}/examples/hierarchy
-	#cp -a ${S}/examples/hierarchy/hierarchy ${D}/usr/share/doc/${P}/examples/hierarchy
-
-	# Then the cppunittest 'example':
-	dodir /usr/share/doc/${P}/examples/cppunittest
-	cp -a ${S}/examples/cppunittest/*.cpp ${D}/usr/share/doc/${P}/examples/cppunittest
-	cp -a ${S}/examples/cppunittest/*.h ${D}/usr/share/doc/${P}/examples/cppunittest
-	#cp -a ${S}/examples/cppunittest/cppunittestmain ${D}/usr/share/doc/${P}/examples/cppunittest
- 
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS COPYING NEWS README THANKS TODO
+	# the package automatically puts its docs into /usr/share/cppunit
+	# move them to the standard location and clean up
+	mv ${D}/usr/share/cppunit/html ${D}/usr/share/doc/${PF}
+	rm -rf ${D}/usr/share/cppunit
 }
-