Backout e10579e136f1 (bug 680636) for breaking pymake builds

This commit is contained in:
Ed Morley 2011-08-22 22:26:00 +01:00
parent a38f1bf761
commit 6d02b96c78
4 changed files with 4 additions and 10 deletions

View File

@ -672,9 +672,6 @@ endif
PWD := $(CURDIR)
endif
ifdef .PYMAKE
NSINSTALL = %nsinstall nsinstall
else
ifdef NSINSTALL_BIN
NSINSTALL = $(NSINSTALL_BIN)
else
@ -684,7 +681,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)

View File

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

View File

@ -672,9 +672,6 @@ endif
PWD := $(CURDIR)
endif
ifdef .PYMAKE
NSINSTALL = %nsinstall nsinstall
else
ifdef NSINSTALL_BIN
NSINSTALL = $(NSINSTALL_BIN)
else
@ -684,7 +681,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)

View File

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