Make UPnP default on Bitcoin but not on Bitcoind.

[novacoin.git] / src / makefile.osx

diff --git a/src/makefile.osx b/src/makefile.osx
index 784596b..36890f9 100644 (file)
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -16,8 +16,6 @@ LIBPATHS= \
 
 WXLIBS=$(shell $(DEPSDIR)/bin/wx-config --libs --static)
 
-USE_UPNP:=0
-
 LIBS= -dead_strip \
  $(DEPSDIR)/lib/libdb_cxx-4.8.a \
  $(DEPSDIR)/lib/libboost_system.a \
@@ -49,10 +47,17 @@ OBJS= \
     cryptopp/obj/sha.o \
     cryptopp/obj/cpu.o
 
-ifdef USE_UPNP
-       LIBS += $(DEPSDIR)/lib/libminiupnpc.a
-       DEFS += -DUSE_UPNP=$(USE_UPNP)
-endif
+bitcoin: USE_UPNP:=1
+       ifdef USE_UPNP
+               LIBS += $(DEPSDIR)/lib/libminiupnpc.a
+               DEFS += -DUSE_UPNP=$(USE_UPNP)
+       endif
+
+bitcoind: USE_UPNP:=0
+       ifdef USE_UPNP
+               LIBS += $(DEPSDIR)/lib/libminiupnpc.a
+               DEFS += -DUSE_UPNP=$(USE_UPNP)
+       endif
        
 
 all: bitcoin