diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-06-16 10:43:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-06-16 10:43:04 -0400 |
| commit | 55796deebb553d23b524267d93812dcc7ff00679 (patch) | |
| tree | f342993bf2da5aafbc604d8be69badfdbdc0829d | |
| parent | 430566a393266883df8af922185e57164f474d08 (diff) | |
MAINT-7505: correct packaging of python llbase
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 001c4817b1..58bdf1816f 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -372,7 +372,7 @@ class WindowsManifest(ViewerManifest): relpkgdir = os.path.join(pkgdir, "lib", "release") debpkgdir = os.path.join(pkgdir, "lib", "debug") vmpdir = os.path.join(pkgdir, "VMP") - llbasedir = os.path.join(pkgdir, "llbase") + llbasedir = os.path.join(pkgdir, "lib", "python", "llbase") if self.is_packaging_viewer(): # Find secondlife-bin.exe in the 'configuration' dir, then rename it to the result of final_exe. @@ -792,7 +792,7 @@ class DarwinManifest(ViewerManifest): relpkgdir = os.path.join(pkgdir, "lib", "release") debpkgdir = os.path.join(pkgdir, "lib", "debug") vmpdir = os.path.join(pkgdir, "VMP") - llbasedir = os.path.join(pkgdir, "llbase") + llbasedir = os.path.join(pkgdir, "lib", "python", "llbase") requestsdir = os.path.join(pkgdir, "requests") if self.prefix(src="", dst="Contents"): # everything goes in Contents @@ -1255,8 +1255,8 @@ class LinuxManifest(ViewerManifest): if not os.path.exists(llbase_path): os.makedirs(llbase_path) if self.prefix(dst="llbase"): - self.path2basename("../packages/llbase","*.py") - self.path2basename("../packages/llbase","_cllsd.so") + self.path2basename("../packages/lib/python/llbase","*.py") + self.path2basename("../packages/lib/python/llbase","_cllsd.so") self.end_prefix("bin") if self.prefix("res-sdl"): |