[Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/01/04 22:32:42

Modified files:
        config         : Makefile.config.in Makefile.in 
        distrib        : ChangeLog 

Log message:
        patch #4761

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/Makefile.config.in.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/Makefile.in.diff?tr1=1.139&tr2=1.140&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.654&tr2=1.655&r1=text&r2=text

Patches:
Index: mldonkey/config/Makefile.config.in
diff -u mldonkey/config/Makefile.config.in:1.54 
mldonkey/config/Makefile.config.in:1.55
--- mldonkey/config/Makefile.config.in:1.54     Sun Dec 18 16:51:32 2005
+++ mldonkey/config/Makefile.config.in  Wed Jan  4 22:32:42 2006
@@ -46,6 +46,7 @@
 address@hidden@
 address@hidden@
 
address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
Index: mldonkey/config/Makefile.in
diff -u mldonkey/config/Makefile.in:1.139 mldonkey/config/Makefile.in:1.140
--- mldonkey/config/Makefile.in:1.139   Sun Dec 18 16:51:32 2005
+++ mldonkey/config/Makefile.in Wed Jan  4 22:32:42 2006
@@ -13,6 +13,10 @@
 
 include config/Makefile.config
 
+ifneq ("$(GLIBC_VERSION)" , "")
+  GLIBC_VERSION_ARCH = "_glibc-"$(GLIBC_VERSION)
+endif
+
 ##################################################################
 
 ##             Bytecode or Native ?
@@ -1797,8 +1801,8 @@
        done
        mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
        tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
-       mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname 
-s`.tar
-       $(COMPRESS) mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s`.tar
+       mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
+       $(COMPRESS) mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
 
 upload.shared: release.shared
        scp mldonkey-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname 
-s`.tar.$(COMPRESS_EXT) lachesis:devel/mldonkey-release/
@@ -1814,8 +1818,8 @@
        done
        mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
        tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
-       mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`.tar
-       $(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s`.tar
+       mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
+       $(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
 
 release.mlnet.static: mlnet.static
        rm -rf mldonkey-*
@@ -1823,8 +1827,8 @@
        cp mlnet.static $(DISDIR)/mlnet && strip $(DISDIR)/mlnet
        mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
        tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
-       mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`.tar
-       $(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s`.tar
+       mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
+       $(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
 
 release.mlnet.distri: mlnet mlnet.static
        rm -rf mldonkey-*
@@ -1833,8 +1837,8 @@
        cp mlnet.static $(DISDIR)/mlnet.static && strip $(DISDIR)/mlnet.static
        mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
        tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
-       mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`.tar
-       $(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s`.tar
+       mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
+       $(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
 
 release.utils.shared: mld_hash make_torrent
        rm -rf mldonkey-*
@@ -1843,8 +1847,8 @@
        cp -f make_torrent $(DISDIR)/make_torrent && strip  
$(DISDIR)/make_torrent
        mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
        tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
-       mv $(DISDIR).tar 
mldonkey-tools-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname -s`.tar
-       $(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname 
-s`.tar
+       mv $(DISDIR).tar 
mldonkey-tools-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
+       $(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).shared.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
 
 release.utils.static: mld_hash.static make_torrent.static
        rm -rf mldonkey-*
@@ -1853,8 +1857,8 @@
        cp -f make_torrent.static $(DISDIR)/make_torrent && strip  
$(DISDIR)/make_torrent
        mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
        tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
-       mv $(DISDIR).tar 
mldonkey-tools-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname -s`.tar
-       $(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`.tar
+       mv $(DISDIR).tar 
mldonkey-tools-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
+       $(COMPRESS) mldonkey-tools-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
 
 upload.static: release.static
        scp mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`.tar.$(COMPRESS_EXT) lachesis:devel/mldonkey-release/
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.654 mldonkey/distrib/ChangeLog:1.655
--- mldonkey/distrib/ChangeLog:1.654    Wed Jan  4 21:39:09 2006
+++ mldonkey/distrib/ChangeLog  Wed Jan  4 22:32:42 2006
@@ -12,6 +12,7 @@
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
 2006/01/04
+4761: Insert glibc version in archives build by release targets
 4760: Allow use of Ocaml 3.09.1
       MLDonkey can now be compiled with Ocaml 3.08.3/4, 3.09.0/1
       Default for MLDonkey-compiled Ocaml is now 3.09.1