Bug 680636 - Execute nsinstall.py as Python module under PyMake; r=khuey

config/config.mk

@@ -672,6 +672,9 @@ endif
 PWD := $(CURDIR)
 endif
 
+ifdef .PYMAKE
+NSINSTALL = %nsinstall nsinstall
+else
 ifdef NSINSTALL_BIN
 NSINSTALL = $(NSINSTALL_BIN)
 else
@@ -681,7 +684,7 @@ else
 NSINSTALL = $(CONFIG_TOOLS)/nsinstall$(HOST_BIN_SUFFIX)
 endif # OS2
 endif # NSINSTALL_BIN
-
+endif # .PYMAKE
 
 ifeq (,$(CROSS_COMPILE)$(filter-out WINNT OS2, $(OS_ARCH)))
 INSTALL		= $(NSINSTALL)

config/nsinstall.py

@@ -101,7 +101,7 @@ def nsinstall(argv):
         sys.exit(1)
       if options.m:
         os.chmod(args[0], options.m)
-      sys.exit()
+      return 0
     if options.m:
       os.makedirs(args[0], options.m)
     else:

js/src/config/config.mk

@@ -672,6 +672,9 @@ endif
 PWD := $(CURDIR)
 endif
 
+ifdef .PYMAKE
+NSINSTALL = %nsinstall nsinstall
+else
 ifdef NSINSTALL_BIN
 NSINSTALL = $(NSINSTALL_BIN)
 else
@@ -681,7 +684,7 @@ else
 NSINSTALL = $(CONFIG_TOOLS)/nsinstall$(HOST_BIN_SUFFIX)
 endif # OS2
 endif # NSINSTALL_BIN
-
+endif # .PYMAKE
 
 ifeq (,$(CROSS_COMPILE)$(filter-out WINNT OS2, $(OS_ARCH)))
 INSTALL		= $(NSINSTALL)

js/src/config/nsinstall.py

@@ -101,7 +101,7 @@ def nsinstall(argv):
         sys.exit(1)
       if options.m:
         os.chmod(args[0], options.m)
-      sys.exit()
+      return 0
     if options.m:
       os.makedirs(args[0], options.m)
     else: