From 491e93f898ed1a6e825ea487b918c0103dec42e3 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Tue, 15 Dec 2009 18:57:26 -0800
Subject: Fixed misspelled debug qt names

---
 indra/newview/viewer_manifest.py | 44 ++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 1e13d6a031..24d92c37ad 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -333,7 +333,8 @@ class WindowsManifest(ViewerManifest):
             self.end_prefix()
 
         if self.args['configuration'].lower() == 'debug':
-            if self.prefix(src="../../libraries/i686-win32/lib/debug", dst="llplugin"):
+            if self.prefix(src=os.path.join(os.pardir, os.pardir, 'libraries', 'i686-win32', 'lib', 'debug'),
+                           dst="llplugin"):
                 self.path("libeay32.dll")
                 self.path("qtcored4.dll")
                 self.path("qtguid4.dll")
@@ -341,19 +342,21 @@ class WindowsManifest(ViewerManifest):
                 self.path("qtopengld4.dll")
                 self.path("qtwebkitd4.dll")
                 self.path("ssleay32.dll")
-                self.end_prefix()
 
-            # For WebKit/Qt plugin runtimes (image format plugins)
-            if self.prefix(src="../../libraries/i686-win32/lib/debug/imageformats", dst="llplugin/imageformats"):
-                self.path("qgif4d.dll")
-                self.path("qico4d.dll")
-                self.path("qjpeg4d.dll")
-                self.path("qmng4d.dll")
-                self.path("qsvg4d.dll")
-                self.path("qtiff4d.dll")
+                # For WebKit/Qt plugin runtimes (image format plugins)
+                if self.prefix(src="imageformats", dst="llplugin/imageformats"):                
+                    self.path("qgifd4.dll")
+                    self.path("qicod4.dll")
+                    self.path("qjpegd4.dll")
+                    self.path("qmngd4.dll")
+                    self.path("qsvgd4.dll")
+                    self.path("qtiffd4.dll")
+                    self.end_prefix()
+
                 self.end_prefix()
         else:
-            if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
+            if self.prefix(src=os.path.join(os.pardir, os.pardir, 'libraries', 'i686-win32', 'lib', 'release'),
+                           dst="llplugin"):
                 self.path("libeay32.dll")
                 self.path("qtcore4.dll")
                 self.path("qtgui4.dll")
@@ -361,16 +364,17 @@ class WindowsManifest(ViewerManifest):
                 self.path("qtopengl4.dll")
                 self.path("qtwebkit4.dll")
                 self.path("ssleay32.dll")
-                self.end_prefix()
 
-            # For WebKit/Qt plugin runtimes (image format plugins)
-            if self.prefix(src="../../libraries/i686-win32/lib/release/imageformats", dst="llplugin/imageformats"):
-                self.path("qgif4.dll")
-                self.path("qico4.dll")
-                self.path("qjpeg4.dll")
-                self.path("qmng4.dll")
-                self.path("qsvg4.dll")
-                self.path("qtiff4.dll")
+                # For WebKit/Qt plugin runtimes (image format plugins)
+                if self.prefix(src="imageformats", dst="llplugin/imageformats"):
+                    self.path("qgif4.dll")
+                    self.path("qico4.dll")
+                    self.path("qjpeg4.dll")
+                    self.path("qmng4.dll")
+                    self.path("qsvg4.dll")
+                    self.path("qtiff4.dll")
+                    self.end_prefix()
+
                 self.end_prefix()
 
         self.disable_manifest_check()
-- 
cgit v1.2.3