diff options
| author | Christian Goetze <cg@lindenlab.com> | 2009-02-04 08:31:03 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2009-02-04 08:31:03 +0000 |
| commit | 6b7b75e9cb9b8d4e746ba447eb37189adce14f81 (patch) | |
| tree | 92596e727415f944c433c6fdf24d88ff393f4fc8 | |
| parent | 5edacb93dd41385c0156c212e497f84197120309 (diff) | |
further little tweak so that viewer_manifest.py survives mangling by the open source export
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index bccd77d7fa..fb474840e7 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -166,8 +166,7 @@ class WindowsManifest(ViewerManifest): 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 @@ class Linux_i686Manifest(LinuxManifest): # 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 |