Merge remote-tracking branch 'origin/master'

* src/Makefile:

diff --cc src/Makefile
index 65a9a3b82234869f5c1e68933b4452cc44be4763,5d18c921d45163f869cd4c90c63fb8b693d6a495..a1c21af30cab2596774617bd174ebff2c0809d05
--- 1/src/Makefile
--- 2/src/Makefile
+++ b/src/Makefile
@@@ -262,15 -262,9 +262,16 @@@ imachdmg : imachopt.o ../distributions/
  
  md5:
        ls ../build/Output/* | xargs md5sum
 -upload:
 -#     rsync -v ../build/Output/imach-0.99s8-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 -      rsync -v ../build/Output/imach0.99s8.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 +uploadrpm:
 +      echo $(VERSION)
 +      rsync -v ../build/Output/imach-$(VERSION)-1.src.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 +      rsync -v ../build/Output/imach-$(VERSION)-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 +
 +uploaddmg:
 +      rsync -v ../build/Output/imach-$(VERSION).dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
++
 +uploadsetup:
 +      rsync -v ../build/Output/imach-$(VERSION)-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
  
  $(PARAM).htm: imach $(PARAM).imach data1.txt
        ./imach $(PARAM).imach