[gentoo-commits] repo/proj/guru:master commit in: dev-lang/aldor/

[Andrew Ammerlaan]

commit:     093682b5867d4ecab7c1f0e2ff834d6068488210
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Mar 15 12:19:01 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Mar 18 09:45:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=093682b5

dev-lang/aldor: install headers in a subfolder

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 dev-lang/aldor/aldor-1.2.0_p20190730.ebuild | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild 
b/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild
index ffecfcf..8386e04 100644
--- a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild
+++ b/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild
@@ -68,7 +68,10 @@ src_prepare() {
 }
 
 src_configure() {
+       #install headers in a subfolder to avoid collisions with another 
packages
        local myconf=(
+               --prefix="${EPREFIX}/usr"
+               --includedir="${EPREFIX}/usr/include/aldor"
                --disable-static
                --enable-libraries
                --enable-shared
@@ -81,10 +84,11 @@ src_configure() {
 
 src_compile() {
        if use doc ; then
-               ( cd "${S}/aldorug"; emake aldorug.pdf ) || die "make 
aldorug.pdf failed"
-               ( cd "${S}/lib/aldor/tutorial"
-                       pdflatex tutorial.tex
-                       pdflatex tutorial.tex ) || die "make tutorial.pdf 
failed"
+               cd "${S}/aldorug"
+               emake aldorug.pdf || die "make aldorug.pdf failed"
+
+               cd "${S}/lib/aldor/tutorial"
+               pdflatex tutorial.tex || die "make tutorial.pdf failed"
        fi
        cd "${S}"
        if use emacs ; then
@@ -93,7 +97,6 @@ src_compile() {
                if use doc ; then
                        einfo "Documentation for the aldor emacs mode"
                        noweave "aldor.el.nw" > aldor-mode.tex
-                       pdflatex aldor-mode.tex
                        pdflatex aldor-mode.tex || die "make aldor-mode.pdf 
failed"
                fi
        fi