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

[Михаил Страшун]

    Date: Wednesday, October 9, 2013 @ 13:48:24
  Author: dicebot
Revision: 98382

upgpkg: dmd 2.063.2-4

Merge phobos and druntime into single folder

Modified:
  dmd/trunk/PKGBUILD

----------+
 PKGBUILD |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-09 08:18:19 UTC (rev 98381)
+++ PKGBUILD	2013-10-09 11:48:24 UTC (rev 98382)
@@ -10,7 +10,7 @@
 groups=('dlang' 'dlang-dmd')
 pkgbase=dmd
 pkgver=2.063.2
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.dlang.org"
 makedepends=('git' 'gcc' 'make')
@@ -62,7 +62,7 @@
     install -Dm755 $srcdir/dmd/src/dmd $pkgdir/usr/bin/dmd
 
     mkdir -p $pkgdir/etc
-    echo -e "[Environment]\nDFLAGS=-I/usr/include/dlang/dmd -I/usr/include/dlang/dmd/druntime/import -L-L/usr/lib -L-L/usr/lib32 -L--no-warn-search-mismatch -L--export-dynamic" > $pkgdir/etc/dmd.conf
+    echo -e "[Environment]\nDFLAGS=-I/usr/include/dlang/dmd -L-L/usr/lib -L-L/usr/lib32 -L--no-warn-search-mismatch -L--export-dynamic" > $pkgdir/etc/dmd.conf
 
     install -Dm644 $srcdir/dmd/docs/man/man1/dmd.1 $pkgdir/usr/share/man/man1/dmd.1
     install -Dm644 $srcdir/dmd/docs/man/man1/dmd.conf.5 $pkgdir/usr/share/man/man5/dmd.conf.5
@@ -89,10 +89,8 @@
 
     mkdir -p $pkgdir/usr/include/dlang/dmd
     cp -r $srcdir/phobos/{*.d,etc,std} $pkgdir/usr/include/dlang/dmd
+    cp -r $srcdir/druntime/import/* $pkgdir/usr/include/dlang/dmd/
 
-    mkdir -p $pkgdir/usr/include/dlang/dmd/druntime
-    cp -r $srcdir/druntime/import $pkgdir/usr/include/dlang/dmd/druntime
-
     find $pkgdir/usr -type f | xargs chmod 0644
 
     install -Dm644 $srcdir/druntime/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE-druntime