diff options
author | haawda | 2017-05-01 20:49:02 +0200 |
---|---|---|
committer | haawda | 2017-05-01 20:49:02 +0200 |
commit | ee1cb05b0744bea04ebfffb06f9d530f2ca307ae (patch) | |
tree | 6a600ed924b27b7df8aabfd437fa7d07a43230ad | |
parent | 0cccfcc80a626657a3a529f63b79633f6382986f (diff) | |
download | aur-ee1cb05b0744bea04ebfffb06f9d530f2ca307ae.tar.gz |
fix aclocal.sh to find guile-config
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 13 |
2 files changed, 7 insertions, 12 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Mon Apr 24 22:51:57 UTC 2017 pkgbase = lilypond-git pkgdesc = An automated music engraving system (Git snapshot) - pkgver = 2.19.59.1.14.geee677c480 + pkgver = 2.19.59.1.18.g6056347657 pkgrel = 1 url = http://lilypond.org/ arch = i686 @@ -17,7 +15,7 @@ pkgbase = lilypond-git makedepends = texlive-langcyrillic makedepends = texi2html makedepends = netpbm - depends = guile>=2.0.13 + depends = guile1.8 depends = pango depends = python2 optdepends = imagemagick: building HTML documentation @@ -4,13 +4,13 @@ # delete the $srcdir directory before building pkgname=lilypond-git -pkgver=2.19.59.1.14.geee677c480 +pkgver=2.19.59.1.18.g6056347657 pkgrel=1 pkgdesc="An automated music engraving system (Git snapshot)" arch=('i686' 'x86_64') url="http://lilypond.org/" license=('GPL') -depends=('guile>=2.0.13' 'pango' 'python2') +depends=('guile1.8' 'pango' 'python2') makedepends=('fontforge' 'git' 'gsfonts' 't1utils' 'ghostscript' 'dblatex' 'texlive-langcyrillic' 'texi2html' 'netpbm') optdepends=('imagemagick: building HTML documentation' @@ -37,13 +37,10 @@ prepare() { sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done - - sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile`"|' configure.ac - sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile`"|' configure.ac - - rm -rf python/out/ +sed -i 's+guile-config-1.8+guile-config1.8+' aclocal.m4 } + build() { cd lilypond/ export PYTHON="python2" @@ -52,7 +49,7 @@ build() { ./autogen.sh \ --prefix=/usr \ --disable-documentation \ - --enable-guile2 + --enable-guile2=no make all } |