From dc0200b4aaaf6ac8244e15e48253a4b7225d13f9 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 9 Jul 2012 19:05:54 +0000 Subject: Don't run ldconfig when destdir is given as option. git-svn-id: http://svn.drobilla.net/autowaf@72 e2e4594f-ea7b-45dc-bc5a-5f5301e603aa --- autowaf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autowaf.py b/autowaf.py index 7f40783..6b9cfa3 100644 --- a/autowaf.py +++ b/autowaf.py @@ -632,7 +632,8 @@ def run_ldconfig(ctx): if (ctx.cmd == 'install' and not ctx.env['RAN_LDCONFIG'] and ctx.env['LIBDIR'] - and not 'DESTDIR' in os.environ): + and not 'DESTDIR' in os.environ + and not Options.options.destdir): try: Logs.info("Waf: Running `/sbin/ldconfig %s'" % ctx.env['LIBDIR']) subprocess.call(['/sbin/ldconfig', ctx.env['LIBDIR']]) -- cgit v1.2.1