From 6b7b75e9cb9b8d4e746ba447eb37189adce14f81 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Wed, 4 Feb 2009 08:31:03 +0000
Subject: [PATCH] further little tweak so that viewer_manifest.py survives
mangling by the open source export
---
indra/newview/viewer_manifest.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index bccd77d7fac..fb474840e72 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -166,8 +166,7 @@ def construct(self):
self.path(self.find_existing_file('debug/secondlife-bin.exe', 'release/secondlife-bin.exe', 'relwithdebinfo/secondlife-bin.exe'), dst=self.final_exe())
# need to get the kdu dll from any of the build directories as well
try:
- self.path(self.find_existing_file(
- '../llkdu/%s/llkdu.dll' % self.args['configuration'],
+ self.path(self.find_existing_file('../llkdu/%s/llkdu.dll' % self.args['configuration'],
'../../libraries/i686-win32/lib/release/llkdu.dll'),
dst='llkdu.dll')
pass
@@ -626,8 +625,7 @@ def construct(self):
# install either the libllkdu we just built, or a prebuilt one, in
# decreasing order of preference. for linux package, this goes to bin/
try:
- self.path(self.find_existing_file(
- '../llkdu/libllkdu.so',
+ self.path(self.find_existing_file('../llkdu/libllkdu.so',
'../../libraries/i686-linux/lib_release_client/libllkdu.so'),
dst='bin/libllkdu.so')
# keep this one to preserve syntax, open source mangling removes previous lines
--
GitLab