--- embedaddon/miniupnpc/Makefile 2013/07/22 00:36:10 1.1.1.2 +++ embedaddon/miniupnpc/Makefile 2013/07/22 00:37:39 1.1.1.2.2.1 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1.1.2 2013/07/22 00:36:10 misho Exp $ +# $Id: Makefile,v 1.1.1.2.2.1 2013/07/22 00:37:39 misho Exp $ # MiniUPnP Project # http://miniupnp.free.fr/ # http://miniupnp.tuxfamily.org/ @@ -35,7 +35,7 @@ CFLAGS += -W -Wstrict-prototypes CFLAGS += -fno-common CFLAGS += -DMINIUPNPC_SET_SOCKET_TIMEOUT CFLAGS += -DMINIUPNPC_GET_SRC_ADDR -CFLAGS += -D_BSD_SOURCE -D_POSIX_C_SOURCE=1 +CFLAGS += -D_BSD_SOURCE CFLAGS += -ansi # -DNO_GETADDRINFO INSTALL = install @@ -80,7 +80,7 @@ ifeq ($(OS), Darwin) SONAME = $(basename $(SHAREDLIBRARY)).$(APIVERSION).dylib CFLAGS := -DMACOSX -D_DARWIN_C_SOURCE $(CFLAGS) else -ifeq ($(OS), Linux) +ifeq ($(OS), FreeBSD) SHAREDLIBRARY = libminiupnpc.so SONAME = $(SHAREDLIBRARY).$(APIVERSION) endif @@ -110,13 +110,11 @@ TESTMINIWGETOBJS := $(TESTMINIWGETOBJS) minissdpc.o TESTIGDDESCPARSE := $(TESTIGDDESCPARSE) minissdpc.o endif -LIBDIR ?= lib # install directories -INSTALLPREFIX ?= $(PREFIX)/usr INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc -INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR) +INSTALLDIRLIB = $(INSTALLPREFIX)/lib INSTALLDIRBIN = $(INSTALLPREFIX)/bin -INSTALLDIRMAN = $(INSTALLPREFIX)/share/man +INSTALLDIRMAN = $(INSTALLPREFIX)/man FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES) ifneq ($(OS), AmigaOS)