← Back to branch summary

~micahg/mozilla-devscripts/ff-tb-unversioned

« back to all changes in this revision

Viewing changes to src/install-xpi

  • Committer: Benjamin Drung
  • Date: 2010-01-11 22:30:43 UTC
  • Revision ID: bdrung@ubuntu.com-20100111223043-k5ik1ba0ccgt69j0
http://bugs.debian.org/564671
  - create links for architecture independent extensions in /usr/share instead
    of /usr/lib (Closes: #564671)
    - update src/install-xpi

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/install-xpi
77
77
        xpi_content = zfobj.namelist()
78
78
 
79
79
        # determine installation directory
 
80
        if get_arch(package) == "all":
 
81
                lib_share_dir = "share"
 
82
        else:
 
83
                lib_share_dir = "lib"
80
84
        if install_dir is None:
81
 
                if get_arch(package) == "all":
82
 
                        lib_share_dir = "share"
83
 
                else:
84
 
                        lib_share_dir = "lib"
85
85
                install_dir = os.path.join("usr", lib_share_dir, package)
86
86
        copy_dir = os.path.join("debian", package, install_dir.strip("/"))
87
87
        if verbose:
130
130
        extension_id = get_extension_id(os.path.join(copy_dir, "install.rdf"))
131
131
        target_applications = get_target_applications(script_name, os.path.join(copy_dir, "install.rdf"))
132
132
        for target_application in target_applications:
133
 
                destination = os.path.join("/usr/lib/mozilla/extensions/", target_application, extension_id)
 
133
                destination = os.path.join("/usr", lib_share_dir, "mozilla/extensions",
 
134
                                target_application, extension_id)
134
135
                links.add(destination)
135
136
 
136
137
        # create symlinks