diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-11 17:29:20 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-11 17:29:20 +0200 |
| commit | 7a42705e87e0da5d2417b4293729e3ee1ae3b33c (patch) | |
| tree | 04aa72c4fdff134e2c5ae9f539e092d5faafe808 /extra/avahi | |
| parent | e6ced89f44186539d8fedf73b62024aa2214230e (diff) | |
| parent | 337402b957bab442da9e0d46ee7a8d8f32ede3ce (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/botan/PKGBUILD
community/qgo/PKGBUILD
community/ragel/PKGBUILD
extra/avahi/PKGBUILD
extra/kdepim/PKGBUILD
extra/libva/PKGBUILD
extra/libwnck3/PKGBUILD
extra/orc/PKGBUILD
extra/python/PKGBUILD
extra/python2/PKGBUILD
extra/qt3/PKGBUILD
Diffstat (limited to 'extra/avahi')
| -rw-r--r-- | extra/avahi/PKGBUILD | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 93140516c..7682e6db2 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178950 2013-03-01 10:19:30Z andrea $ +# $Id: PKGBUILD 182390 2013-04-09 21:23:22Z eric $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> @@ -49,10 +49,8 @@ build() { [ "$CARCH" = "mips64el" ] && \ extra="--disable-mono" - export MOC_QT3=/opt/qt/bin/moc - export MOC_QT4=/usr/lib/qt4/bin/moc - source /etc/profile.d/qt3.sh - source /etc/profile.d/qt4.sh + export MOC_QT3=/usr/bin/moc-qt3 + export MOC_QT4=/usr/bin/moc-qt4 # pygtk requires python2; make it explicit in case other python are installed: FS#21865 PYTHON=python2 \ |