Make scons 'loadable_module' output consistent with make output location...

pylib/gyp/generator/make.py

 #!/usr/bin/python
 
 # Notes:
 #
 # This is all roughly based on the Makefile system used by the Linux
 # kernel, but is a non-recursive make -- we put the entire dependency
 # graph in front of make and let it figure it out.
 #
 # The code below generates a separate .mk file for each target, but
 # all are sourced by the top-level Makefile.  This means that all
@@ skipping 583 matching lines @@
 
   def ComputeOutput(self, spec):
     """Return the 'output' (full output path) of a gyp spec.
 
     E.g., the loadable module 'foobar' in directory 'baz' will produce
       '$(obj)/baz/libfoobar.so'
     """
     output = None
     target = spec['target_name']
     if self.type == 'static_library':
-      target = 'lib%s.a' % target
+      target = 'lib%s.a' % (target[:3] == 'lib' and [target[3:]] or [target])[0]
     elif self.type in ('loadable_module', 'shared_library'):
-      target = 'lib%s.so' % target
+      target = 'lib%s.so' % (target[:3] == 'lib' and [target[3:]] or [target])[0]
     elif self.type == 'none':
       target = '%s.stamp' % target
     elif self.type == 'settings':
       return None
     elif self.type == 'executable':
       target = spec.get('product_name', target)
     else:
       print ("ERROR: What output file should be generated?",
              "typ", self.type, "target", target)
 
@@ skipping 252 matching lines @@
         ' '.join(build_files),
         gyp.common.EncodePOSIXShellList(
             [gyp.common.FixIfRelativePath(params['gyp_binary'], options.depth),
              '-fmake'] +
             gyp.RegenerateFlags(options) +
             build_files_args)))
 
   root_makefile.write(SHARED_FOOTER)
 
   root_makefile.close()