mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 23:31:56 +00:00
Minor change to the 'test' commands. QNX breaks if there isn't an else block....
This commit is contained in:
parent
3c5ec5673b
commit
caee827d8a
@ -64,7 +64,7 @@ endif
|
||||
|
||||
# Redefine MAKE_OBJDIR for just this directory
|
||||
define MAKE_OBJDIR
|
||||
if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); fi
|
||||
if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); else true; fi
|
||||
endef
|
||||
|
||||
export:: $(TARGETS)
|
||||
|
@ -164,7 +164,7 @@ endif
|
||||
MAKE_OBJDIR = mkdir $(OBJDIR)
|
||||
else
|
||||
define MAKE_OBJDIR
|
||||
if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
|
||||
if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); else true; fi
|
||||
endef
|
||||
endif
|
||||
|
||||
@ -278,7 +278,7 @@ ifdef NSPR_AUTOCONF
|
||||
endif # NSPR_AUTOCONF
|
||||
else
|
||||
@(cd $(DEPTH)/nsprpub/config; \
|
||||
if test -f UNIX.mk.orig; then rm -f UNIX.mk; mv UNIX.mk.orig UNIX.mk; fi; \
|
||||
if test -f UNIX.mk.orig; then rm -f UNIX.mk; mv UNIX.mk.orig UNIX.mk; else true; fi; \
|
||||
mv UNIX.mk UNIX.mk.orig; \
|
||||
awk '/^OBJDIR_NAME[ ]*=/ { \
|
||||
printf("OBJDIR_NAME\t= %s%s%s%s%s%s.OBJ\n","$(OS_CONFIG)","$(OS_VERSION)","$(PROCESSOR_ARCHITECTURE)","$(COMPILER)","$(IMPL_STRATEGY)","$(OBJDIR_TAG)"); next} {print}' UNIX.mk.orig > UNIX.mk)
|
||||
|
Loading…
Reference in New Issue
Block a user