diff options
| author | wchang0222%aol.com <devnull@localhost> | 2004-03-23 00:56:47 +0000 |
|---|---|---|
| committer | wchang0222%aol.com <devnull@localhost> | 2004-03-23 00:56:47 +0000 |
| commit | a056d63d82efa49f3b41b638d7b24d901e89ddd5 (patch) | |
| tree | e3abe9d6a61e97ef26c579399b888169739482bb | |
| parent | 8d91a9bacffd28705bbfff0ff3a324c96fbdb675 (diff) | |
| download | nss-hg-a056d63d82efa49f3b41b638d7b24d901e89ddd5.tar.gz | |
Bugzilla bug 172651: added a necessary test for MinGW gcc in rules.mk.
Do not install 'nsinstall' to avoid overwriting Mozilla's 'nsinstall'.
r=cls. a=chofmann for Mozilla 1.7 final.
Modified Files:
Tag: NSS_3_9_BRANCH
rules.mk nsinstall/Makefile
| -rw-r--r-- | security/coreconf/nsinstall/Makefile | 1 | ||||
| -rw-r--r-- | security/coreconf/rules.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/security/coreconf/nsinstall/Makefile b/security/coreconf/nsinstall/Makefile index 1bb7d728f..f8eb829de 100644 --- a/security/coreconf/nsinstall/Makefile +++ b/security/coreconf/nsinstall/Makefile @@ -52,6 +52,7 @@ ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) PROGRAM = else TARGETS = $(PROGRAM) $(PLSRCS:.pl=) +INSTALL = true endif ifdef NATIVE_CC diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index ff380d472..1fc34a259 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -301,7 +301,7 @@ get_objs: $(LIBRARY): $(OBJS) @$(MAKE_OBJDIR) rm -f $@ -ifeq (,$(filter-out WIN%,$(OS_TARGET))) +ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) $(AR) $(subst /,\\,$(OBJS)) else $(AR) $(OBJS) |