diff --git a/addon-sdk/Makefile.in b/addon-sdk/Makefile.in index 69b25924144b..477243041d2d 100644 --- a/addon-sdk/Makefile.in +++ b/addon-sdk/Makefile.in @@ -4,8 +4,6 @@ include $(topsrcdir)/config/config.mk -export PYMAKE = $(.PYMAKE) - libs:: $(PYTHON) $(srcdir)/copy_source.py $(topsrcdir) $(srcdir)/source/lib $(FINAL_TARGET)/modules/commonjs >copy_source.mk $(MAKE) -f copy_source.mk libs diff --git a/addon-sdk/copy_source.py b/addon-sdk/copy_source.py index 7f07764308c7..2710eca103ba 100644 --- a/addon-sdk/copy_source.py +++ b/addon-sdk/copy_source.py @@ -3,31 +3,14 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. import os -import posixpath import sys - -def normpath(path): - """Ensure UNIX style paths are used with GNU make on Windows. - - This can be removed once we no longer support GNU make on Windows (bug - 828317). - """ - if os.environ.get('PYMAKE') or os.name not in ('nt', 'ce'): - return path - - if len(path) > 2 and path[1] == ':': - path = '/' + path[0] + path[2:] - - return posixpath.normpath(path) - - if len(sys.argv) != 4: print >> sys.stderr, "Usage: copy_source.py " \ " " sys.exit(1) -topsrcdir = normpath(sys.argv[1]) +topsrcdir = sys.argv[1] source_dir = sys.argv[2] target_dir = sys.argv[3]