summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2011-07-01 20:33:45 +0000
committerKeri Harris <keri@gentoo.org>2011-07-01 20:33:45 +0000
commit9a202c00a3d09de6cd2a71450fdb5e2108b10636 (patch)
treecff8ae5fbc97e9dcdac3e401b189584e4adef0b9 /dev-lang/gprolog
parentUse absolute paths in patch so we won't get QA warning. (diff)
downloadgentoo-2-9a202c00a3d09de6cd2a71450fdb5e2108b10636.tar.gz
gentoo-2-9a202c00a3d09de6cd2a71450fdb5e2108b10636.tar.bz2
gentoo-2-9a202c00a3d09de6cd2a71450fdb5e2108b10636.zip
Simplify install - docs and examples are installed based on use_with() parameters in src_configure()
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/gprolog')
-rw-r--r--dev-lang/gprolog/ChangeLog7
-rw-r--r--dev-lang/gprolog/files/gprolog-1.4.0-nodocs.patch38
-rw-r--r--dev-lang/gprolog/gprolog-1.4.0.ebuild16
3 files changed, 47 insertions, 14 deletions
diff --git a/dev-lang/gprolog/ChangeLog b/dev-lang/gprolog/ChangeLog
index dbff786ed16e..b82a59305fb3 100644
--- a/dev-lang/gprolog/ChangeLog
+++ b/dev-lang/gprolog/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/gprolog
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.46 2011/07/01 09:54:44 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.47 2011/07/01 20:33:45 keri Exp $
+
+ 01 Jul 2011; <keri@gentoo.org> gprolog-1.4.0.ebuild,
+ +files/gprolog-1.4.0-nodocs.patch:
+ Simplify install - docs and examples are installed based on use_with()
+ parameters in src_configure()
01 Jul 2011; <keri@gentoo.org> gprolog-1.4.0.ebuild:
Split docs and html targets from system targets
diff --git a/dev-lang/gprolog/files/gprolog-1.4.0-nodocs.patch b/dev-lang/gprolog/files/gprolog-1.4.0-nodocs.patch
new file mode 100644
index 000000000000..b68ee7d8ea00
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.0-nodocs.patch
@@ -0,0 +1,38 @@
+--- gprolog-1.4.0.orig/src/Makefile.in 2011-04-09 04:35:22.000000000 +1200
++++ gprolog-1.4.0/src/Makefile.in 2011-07-02 08:25:22.000000000 +1200
+@@ -82,7 +81,7 @@
+ # --- Links --- #
+
+ install-links: uninstall-links
+- if test $(LINKS_DIR) != none; then \
++ if test $(LINKS_DIR) != $(DESTDIR)none; then \
+ ./mkinstalldirs $(LINKS_DIR); \
+ (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \
+ fi
+@@ -97,7 +96,7 @@
+ # --- Documentation --- #
+
+ install-doc:
+- if test $(DOC_DIR) != none; then \
++ if test $(DOC_DIR) != $(DESTDIR)none; then \
+ ./mkinstalldirs $(DOC_DIR); \
+ (F=`cd ../doc; echo $(DOC_FILES)`; \
+ for i in $$F; do $(INSTALL_DATA) ../doc/$$i $(DOC_DIR); done); \
+@@ -113,7 +112,7 @@
+ # --- HTML --- #
+
+ install-html:
+- if test $(HTML_DIR) != none; then \
++ if test $(HTML_DIR) != $(DESTDIR)none; then \
+ ./mkinstalldirs $(HTML_DIR); \
+ (F=`cd ../doc/html_node; echo $(HTML_FILES)`; \
+ for i in $$F; do $(INSTALL_DATA) ../doc/html_node/$$i $(HTML_DIR); done); \
+@@ -129,7 +128,7 @@
+ # --- Examples --- #
+
+ install-examples:
+- if test $(EXAMPLES_DIR) != none; then \
++ if test $(EXAMPLES_DIR) != $(DESTDIR)none; then \
+ ./mkinstalldirs $(EXAMPLES_DIR)/ExamplesPl; \
+ (F=`cd ../examples/ExamplesPl; echo $(EXPL_FILES)`; \
+ for i in $$F; do $(INSTALL_DATA) ../examples/ExamplesPl/$$i $(EXAMPLES_DIR)/ExamplesPl; done); \
diff --git a/dev-lang/gprolog/gprolog-1.4.0.ebuild b/dev-lang/gprolog/gprolog-1.4.0.ebuild
index b1e59867282e..951a47291a77 100644
--- a/dev-lang/gprolog/gprolog-1.4.0.ebuild
+++ b/dev-lang/gprolog/gprolog-1.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.4.0.ebuild,v 1.2 2011/07/01 09:54:44 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.4.0.ebuild,v 1.3 2011/07/01 20:33:45 keri Exp $
EAPI=2
@@ -21,6 +21,7 @@ RDEPEND=""
src_prepare() {
epatch "${FILESDIR}"/${P}-ldflags.patch
+ epatch "${FILESDIR}"/${P}-nodocs.patch
epatch "${FILESDIR}"/${P}-txt-file.patch
}
@@ -53,18 +54,7 @@ src_test() {
src_install() {
cd "${S}"/src
- make DESTDIR="${D}" install-system install-links \
- || die "make install failed"
-
- if use doc; then
- make DESTDIR="${D}" install-html \
- || die "make install-html failed"
- fi
-
- if use examples; then
- make DESTDIR="${D}" install-examples \
- || die "make install-examples failed"
- fi
+ make DESTDIR="${D}" install || die "make install failed"
cd "${S}"
dodoc ChangeLog NEWS PROBLEMS README VERSION || die "dodoc failed"