From 7816dea1cf9765d226ab5f9c91ab2e8e18744543 Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@gmail.com>
Date: Sat, 2 Jun 2012 13:02:39 -0400
Subject: [PATCH] build: Improve PKGBUILD.tmpl

Simpler package function and use $MAKEFLAGS.  There is no longer a need
for DESTDIR or POSTFIX in the Sconstruct file anymore, either.

Signed-off-by: Bryan Schumaker <bjschuma@gmail.com>
---
 PKGBUILD.tmpl | 4 +++-
 Sconstruct    | 7 -------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/PKGBUILD.tmpl b/PKGBUILD.tmpl
index 8cc2c0bd..df6a8ab6 100644
--- a/PKGBUILD.tmpl
+++ b/PKGBUILD.tmpl
@@ -17,11 +17,13 @@ md5sums=
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	scons
+	scons $MAKEFLAGS
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	mkdir -p ${pkgdir}/usr
+	mv bin/ lib/ ${pkgdir}/usr/
 	scons DESTDIR="${pkgdir}" install
 	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/Sconstruct b/Sconstruct
index 2701e88c..372b713d 100644
--- a/Sconstruct
+++ b/Sconstruct
@@ -2,13 +2,6 @@
 import os, sys
 import config
 
-POSTFIX = ""
-DESTDIR = ""
-for argv in sys.argv:
-	split = argv.split("=")
-	if split[0] == "DESTDIR":
-		DESTDIR = split[1] + "/"
-
 FLAGS = ["-O2"]
 if config.DEBUG == True:
 	FLAGS = ["-Wall", "-Werror", "-g", "-DDEBUG"]