testing/crystal: move to subdir core/, add subdir shards/ to path

testing/crystal/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=crystal
 pkgver=0.24.2
-pkgrel=4
+pkgrel=5
 _bootver=0.24.2
 _llvmver=5
 pkgdesc="The Crystal Programming Language"
@@ -31,6 +31,9 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/crystal-lang/$pkgname/archiv
 	"
 builddir="$srcdir/$pkgname-$pkgver"
 
+_coredir="/usr/lib/$pkgname/core"
+_shardsdir="/usr/lib/$pkgname/shards"
+
 export CRYSTAL_CONFIG_VERSION="$pkgver"
 export CRYSTAL_CACHE_DIR="$srcdir/.cache"
 
@@ -76,7 +79,7 @@ build() {
 	cd "$builddir"
 
 	make crystal \
-		CRYSTAL_CONFIG_PATH="lib:/usr/lib/crystal" \
+		CRYSTAL_CONFIG_PATH="lib:$_shardsdir:$_coredir" \
 		PATH="$srcdir/$pkgname-$_bootver-$CBUILD/bin:$PATH" \
 		release=1 \
 		static=${BUILD_STATIC:-}
@@ -94,11 +97,10 @@ package() {
 	install -D -m 755 .build/crystal "$pkgdir"/usr/bin/crystal
 	install -D -m 644 man/crystal.1 "$pkgdir"/usr/share/man/man1/crystal.1
 
-	# XXX: Move to /usr/share...?
-	mkdir -p "$pkgdir"/usr/lib
-	cp -r src "$pkgdir"/usr/lib/$pkgname
+	mkdir -p "$pkgdir$_coredir" "$pkgdir$_shardsdir"
+	cp -r src/* "$pkgdir$_coredir"/
 
-	cd "$pkgdir"/usr/lib/$pkgname
+	cd "$pkgdir$_coredir"
 	rm ext/sigfault.* llvm/ext/llvm_ext.o
 }