diff options
| author | Gianluca Montecchi | 2015-12-06 22:27:25 +0100 |
|---|---|---|
| committer | Gianluca Montecchi | 2015-12-06 22:27:25 +0100 |
| commit | 33a85d5c6b44cbc4ec479cdaeaee23e17bb900a9 (patch) | |
| tree | b62cd5fcd89629611a996ba68e3c6b74c225295b | |
| parent | 574fedddb96ccf0574f636dfcadd5d0efe00967d (diff) | |
| download | aur-33a85d5c6b44cbc4ec479cdaeaee23e17bb900a9.tar.gz | |
Revert "The installation path is now passed as a qmake argument"
This reverts commit 574fedddb96ccf0574f636dfcadd5d0efe00967d.
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
2 files changed, 7 insertions, 9 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Sun Dec 6 21:19:16 UTC 2015 pkgbase = libqglviewer pkgdesc = C++ library based on Qt that eases the creation of OpenGL 3D viewers pkgver = 2.6.3 - pkgrel = 2 + pkgrel = 1 url = http://www.libqglviewer.com/ arch = i686 arch = x86_64 @@ -6,7 +6,7 @@ pkgname=libqglviewer _pkgname=libQGLViewer pkgver=2.6.3 -pkgrel=2 +pkgrel=1 pkgdesc="C++ library based on Qt that eases the creation of OpenGL 3D viewers" url="http://www.libqglviewer.com/" depends=('qt5-base' 'glu' 'mesa' 'qt5-tools') @@ -25,14 +25,14 @@ build() { cd ${_pkgname}-${pkgver} patch -p1 < ../qglviewer.patch - qmake PREFIX=/opt/local -o Makefile ${_pkgname}-${pkgver}.pro || return 1 - + qmake -o Makefile ${_pkgname}-${pkgver}.pro || return 1 + make \ CFLAGS="-pipe ${CFLAGS} -D_REENTRANT -Wall -W -fPIC \$(DEFINES)" \ CXXLIBS=" ${CXXLIBS} " \ CXXFLAGS="-pipe ${CXXFLAGS} -I/usr/include/GL -D_REENTRANT -Wall -W -fPIC \$(DEFINES)" || return 1 - - + + } package() @@ -40,7 +40,7 @@ package() cd ${_pkgname}-${pkgver} make install INSTALL_ROOT="$pkgdir" || return 1 - + # Install license. install -d -m 0755 "${pkgdir}"/usr/share/licenses/$pkgname/ || return 1 install -m 0644 LICENCE GPL_EXCEPTION "${pkgdir}"/usr/share/licenses/$pkgname/ || return 1 |