Index: Makefile --- Makefile.orig +++ Makefile @@ -5,8 +5,8 @@ # http://miniupnp.free.fr/libnatpmp.html OS = $(shell uname -s) -CC = gcc -INSTALL = install -p +CC ?= cc +INSTALL ?= install -p ARCH = $(shell uname -m | sed -e s/i.86/i686/) VERSION = $(shell cat VERSION) @@ -49,9 +49,9 @@ ifneq (,$(findstring WIN,$(OS))) CC = i686-w64-mingw32-gcc EXTRA_LD = -lws2_32 -lIphlpapi -Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc --Wl,kill-at else - SHAREDLIB = libnatpmp.so + SHAREDLIB ?= libnatpmp.so JNISHAREDLIB = libjninatpmp.so - SONAME = $(SHAREDLIB).$(APIVERSION) + SONAME ?= $(SHAREDLIB).$(APIVERSION) SONAMEFLAGS=-Wl,-soname,$(JNISHAREDLIB) endif endif @@ -92,14 +92,13 @@ depend: makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null install: $(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared - $(INSTALL) -d $(INSTALLDIRINC) - $(INSTALL) -m 644 $(HEADERS) $(INSTALLDIRINC) - $(INSTALL) -d $(INSTALLDIRLIB) - $(INSTALL) -m 644 $(STATICLIB) $(INSTALLDIRLIB) - $(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME) - $(INSTALL) -d $(INSTALLDIRBIN) - $(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc - ln -s -f $(SONAME) $(INSTALLDIRLIB)/$(SHAREDLIB) + $(INSTALL_DATA_DIR) $(INSTALLDIRINC) + $(INSTALL_DATA) $(HEADERS) $(INSTALLDIRINC) + $(INSTALL_DATA_DIR) $(INSTALLDIRLIB) + $(INSTALL_DATA) $(STATICLIB) $(INSTALLDIRLIB) + $(INSTALL_DATA) $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME) + $(INSTALL_PROGRAM_DIR) $(INSTALLDIRBIN) + $(INSTALL_PROGRAM) natpmpc-shared $(INSTALLDIRBIN)/natpmpc $(JNIHEADERS): fr/free/miniupnp/libnatpmp/NatPmp.class $(JAVAH) -jni fr.free.miniupnp.libnatpmp.NatPmp