diff options
author | Riccardo Spagni <ric@spagni.net> | 2016-09-17 17:39:06 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2016-09-17 17:39:06 +0200 |
commit | 77224bbf4842f3c7fb53ad7685f45cf768f5ec38 (patch) | |
tree | 18da9d2a85b71038268b80333f3c27a116b6a3a3 /external/miniupnpc/Makefile | |
parent | Merge pull request #1083 (diff) | |
parent | remove errant target_link_libraries (diff) | |
download | monero-77224bbf4842f3c7fb53ad7685f45cf768f5ec38.tar.xz |
Merge pull request #1084
5850122 remove errant target_link_libraries (Riccardo Spagni)
58abc09 don't build any miniupnpc executables (Riccardo Spagni)
114e368 don't build miniupnpc test executables (Riccardo Spagni)
bb69371 updated miniupnp (Riccardo Spagni)
f62ebc5 update rapidjson (Riccardo Spagni)
Diffstat (limited to 'external/miniupnpc/Makefile')
-rw-r--r-- | external/miniupnpc/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/external/miniupnpc/Makefile b/external/miniupnpc/Makefile index 99a69301c..b7826caa1 100644 --- a/external/miniupnpc/Makefile +++ b/external/miniupnpc/Makefile @@ -38,6 +38,9 @@ CFLAGS += -DMINIUPNPC_SET_SOCKET_TIMEOUT CFLAGS += -DMINIUPNPC_GET_SRC_ADDR CFLAGS += -D_BSD_SOURCE CFLAGS += -D_DEFAULT_SOURCE +ifeq ($(OS), NetBSD) +CFLAGS += -D_NETBSD_SOURCE +endif ifneq ($(OS), FreeBSD) ifneq ($(OS), Darwin) #CFLAGS += -D_POSIX_C_SOURCE=200112L @@ -136,7 +139,11 @@ endif LIBDIR ?= lib # install directories -INSTALLPREFIX ?= $(PREFIX)/usr +ifeq ($(strip $(PREFIX)),) +INSTALLPREFIX ?= /usr +else +INSTALLPREFIX ?= $(PREFIX) +endif INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR) INSTALLDIRBIN = $(INSTALLPREFIX)/bin |