[arch-commits] Commit in cppcheck/trunk (PKGBUILD)

[Jelle van der Waa]

    Date: Saturday, August 9, 2014 @ 20:48:54
  Author: jelle
Revision: 117083

clean up pkgbuild

Modified:
  cppcheck/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-09 18:45:35 UTC (rev 117082)
+++ PKGBUILD	2014-08-09 18:48:54 UTC (rev 117083)
@@ -9,34 +9,35 @@
 url="http://cppcheck.wiki.sourceforge.net/"
 license=('GPL')
 depends=('qt5-base' 'python-pygments')
-makedepends=('docbook-xsl' 'qt5-tools')
+makedepends=('docbook-xsl' 'qt5-tools' 'python')
 source=(https://github.com/danmar/cppcheck/archive/${pkgver}.tar.gz)
 sha1sums=('277a214aa8a2bf30180645aca09c1dc9d3069977')
 
 build() {
    cd "${pkgname}-${pkgver}"
-   make CFGDIR=/usr/share/cppcheck/cfg
+   # Unicode fix
+   LANG='en_US.UTF-8' make SRCDIR=build CFGDIR=/usr/share/cppcheck/cfg
    make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.78.1/manpages/docbook.xsl man
 
    cd gui
-   qmake HAVE_RULES=yes CFGDIR=/usr/share/cppcheck/cfg
-   make CFGDIR=/usr/share/cppcheck/cfg
+   qmake HAVE_RULES=yes
+   make SRCDIR=build CFGDIR=/usr/share/cppcheck/cfg HAVE_RULES=yes
 }
 
 check() {
    cd "${pkgname}-${pkgver}"
-  make CFGDIR=./cfg  HAVE_RULES=yestest
+
+   LANG='en_US.UTF-8' make SRCDIR=build CFGDIR=./cfg  HAVE_RULES=yes test
 }
 
 package() {
    cd "${pkgname}-${pkgver}"
-   make DESTDIR=${pkgdir} install 
+   LANG='en_US.UTF-8' make DESTDIR=${pkgdir} SRCDIR=build HAVE_RULES=yes install 
 
    install -D -p -m 644 cppcheck.1 "${pkgdir}"/usr/share/man/man1/cppcheck.1
 
    install -m755 gui/cppcheck-gui "${pkgdir}"/usr/bin
 
-   for _f in cfg/*; do
-     install -D -p -m 644 $_f "${pkgdir}"/usr/share/"${pkgname}"/$_f
-   done
+   install -d "${pkgdir}"/usr/share/cppcheck/cfg
+   install -D ./cfg/* -t "${pkgdir}"/usr/share/cppcheck/cfg
 }