Makefile: Improve Jnaerator targets

Fetch with either wget or curl

miniupnpc/Makefile

@@ -28,6 +28,7 @@ SH = /bin/sh
 JAVA = java
 # see http://code.google.com/p/jnaerator/
 JNAERATOR = jnaerator-0.9.7.jar
+JNAERATORBASEURL = http://jnaerator.googlecode.com/files/
 #following libs are needed on Solaris
 #LDLIBS=-lsocket -lnsl -lresolv
 
@@ -203,28 +204,29 @@ miniupnpcstrings.h:	miniupnpcstrings.h.in updateminiupnpcstrings.sh VERSION
 	$(SH) updateminiupnpcstrings.sh
 
 jnaerator-0.9.8-shaded.jar:
-	wget http://jnaerator.googlecode.com/files/jnaerator-0.9.8-shaded.jar
+	wget $(JNAERATORBASEURL)/$@ || curl -o $@ $(JNAERATORBASEURL)/$@
 
 jnaerator-0.9.7.jar:
-	wget http://jnaerator.googlecode.com/files/jnaerator-0.9.7.jar
+	wget $(JNAERATORBASEURL)/$@ || curl -o $@ $(JNAERATORBASEURL)/$@
 
 jnaerator-0.9.3.jar:
-	wget http://jnaerator.googlecode.com/files/jnaerator-0.9.3.jar
+	wget $(JNAERATORBASEURL)/$@ || curl -o $@ $(JNAERATORBASEURL)/$@
 
 jar: $(SHAREDLIBRARY)  $(JNAERATOR)
-	$(JAVA) -jar $(JNAERATOR) -library miniupnpc miniupnpc.h declspec.h upnpcommands.h \
-	upnpreplyparse.h igd_desc_parse.h miniwget.h upnperrors.h $(SHAREDLIBRARY) \
+	$(JAVA) -jar $(JNAERATOR) -library miniupnpc \
+	miniupnpc.h declspec.h upnpcommands.h upnpreplyparse.h \
+	igd_desc_parse.h miniwget.h upnperrors.h $(SHAREDLIBRARY) \
 	-package fr.free.miniupnp -o . -jar java/miniupnpc_$(JARSUFFIX).jar -v
 
 mvn_install:
 	mvn install:install-file -Dfile=java/miniupnpc_$(JARSUFFIX).jar \
-	  -DgroupId=com.github \
-      -DartifactId=miniupnp \
-      -Dversion=$(VERSION) \
-      -Dpackaging=jar \
-      -Dclassifier=$(JARSUFFIX) \
-      -DgeneratePom=true \
-      -DcreateChecksum=true
+	 -DgroupId=com.github \
+	 -DartifactId=miniupnp \
+	 -Dversion=$(VERSION) \
+	 -Dpackaging=jar \
+	 -Dclassifier=$(JARSUFFIX) \
+	 -DgeneratePom=true \
+	 -DcreateChecksum=true
 
 # make .deb packages
 deb: /usr/share/pyshared/stdeb all