From ed0ace5366f6b17d44ae04dd7830a8403a503265 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Fri, 17 Feb 2012 22:06:45 -0500 Subject: [PATCH] build: Configure scripts to use the correct lib directory When installing through the PKGBUILD, a non-blank DESTDIR is used and the ocarina-* scripts are configured to use the package directory rather than the installed directory. Signed-off-by: Bryan Schumaker --- Sconstruct | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Sconstruct b/Sconstruct index 5e210f26..def19b6d 100644 --- a/Sconstruct +++ b/Sconstruct @@ -66,7 +66,8 @@ env.Alias("tests", [version_h] + [test_list]); # Install Ocarina scripts = os.listdir("scripts/") -lib = DESTDIR + PREFIX + "/lib/ocarina" + POSTFIX +baselib = PREFIX + "/lib/ocarina" + POSTFIX +lib = DESTDIR + baselib bin = DESTDIR + PREFIX + "/bin/" images = lib + "/images" env.Install(lib, ocarina) @@ -81,7 +82,7 @@ def process_script(target, source, env): ocarina = ocarina + "-debug" saria = saria + "-debug" for line in open(source[0].rfile().abspath): - line = line.replace("%%BIN%%", lib + "/ocarina.bin") + line = line.replace("%%BIN%%", baselib + "/ocarina.bin") line = line.replace("%%OCARINA%%", ocarina) line = line.replace("%%SARIA%%", saria) f.write(line)