Index: Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/Makefile.in,v retrieving revision 1.31 diff -u -r1.31 Makefile.in --- Makefile.in 2001/07/14 15:55:26 1.31 +++ Makefile.in 2001/08/28 16:31:24 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -126,7 +126,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DIST_SUBDIRS = data intl common ai server client po doc all: all-redirect @@ -141,7 +141,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) -config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES) +config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) @@ -312,7 +312,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: config.h.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/config.h.in,v retrieving revision 1.45 diff -u -r1.45 config.h.in --- config.h.in 2001/06/15 23:14:09 1.45 +++ config.h.in 2001/08/28 16:31:24 @@ -1,4 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ +/* config.h.in. Generated automatically from configure.in by autoheader. */ #ifndef FC_CONFIG_H #define FC_CONFIG_H @@ -301,6 +301,9 @@ /* Define if you have the header file. */ #undef HAVE_SYS_UIO_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_UTSNAME_H /* Define if you have the header file. */ #undef HAVE_TERMIOS_H Index: configure =================================================================== RCS file: /home/freeciv/CVS/freeciv/configure,v retrieving revision 1.161 diff -u -r1.161 configure --- configure 2001/08/10 14:54:10 1.161 +++ configure 2001/08/28 16:31:29 @@ -6498,7 +6498,7 @@ fi -for ac_hdr in fcntl.h sys/time.h sys/types.h unistd.h +for ac_hdr in fcntl.h sys/time.h sys/types.h unistd.h sys/utsname.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 Index: configure.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/configure.in,v retrieving revision 1.165 diff -u -r1.165 configure.in --- configure.in 2001/08/10 14:54:11 1.165 +++ configure.in 2001/08/28 16:31:29 @@ -476,7 +476,7 @@ dnl Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h sys/time.h sys/types.h unistd.h) +AC_CHECK_HEADERS(fcntl.h sys/time.h sys/types.h unistd.h sys/utsname.h) dnl Avoid including the unix emulation layer if we build mingw executables dnl There would be type conflicts between winsock and bsd/unix includes if test "x$MINGW32" != "xyes"; then Index: ai/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/ai/Makefile.in,v retrieving revision 1.19 diff -u -r1.19 Makefile.in --- ai/Makefile.in 2001/06/15 23:12:43 1.19 +++ ai/Makefile.in 2001/08/28 16:31:29 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -138,7 +138,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/advattitude.P .deps/advdomestic.P .deps/advforeign.P \ .deps/advisland.P .deps/advleader.P .deps/advmilitary.P \ @@ -230,7 +230,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: client/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/Makefile.in,v retrieving revision 1.42 diff -u -r1.42 Makefile.in --- client/Makefile.in 2001/07/14 14:32:25 1.42 +++ client/Makefile.in 2001/08/28 16:31:29 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -150,7 +150,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DIST_SUBDIRS = gui-gtk gui-xaw gui-stub gui-win32 include DEP_FILES = .deps/cityrepdata.P .deps/civclient.P .deps/climisc.P \ @@ -318,7 +318,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: client/clinet.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/clinet.c,v retrieving revision 1.41 diff -u -r1.41 clinet.c --- client/clinet.c 2001/08/25 10:25:33 1.41 +++ client/clinet.c 2001/08/28 16:31:29 @@ -53,6 +53,10 @@ #include #endif +#ifdef HAVE_SYS_UTSNAME_H +#include +#endif + #include "capstr.h" #include "fcintl.h" #include "game.h" @@ -312,6 +316,10 @@ char *server; int port; char str[512]; +#ifdef HAVE_SYS_UTSNAME_H + struct utsname un; + uname(&un); +#endif if ((proxy_url = getenv("http_proxy"))) { if (strncmp(proxy_url,"http://",strlen("http://"))) { @@ -378,13 +386,28 @@ my_closesocket(s); return NULL; } + +#ifdef HAVE_SYS_UTSNAME_H my_snprintf(str,sizeof(str), - "GET %s%s%s HTTP/1.0\r\nUser-Agent: Freeciv/%s %s\r\n\r\n", + "GET %s%s%s HTTP/1.0\r\nUser-Agent: Freeciv/%s %s %s %s [%s]\r\n\r\n", proxy_url ? "" : "/", urlpath, proxy_url ? metaserver : "", VERSION_STRING, + client_string, + un.sysname, + un.release, + un.machine); +#else /* ! HAVE_SYS_UTSNAME_H */ + my_snprintf(str,sizeof(str), + "GET %s%s%s HTTP/1.0\r\nUser-Agent: Freeciv/%s %s unknown\r\n\r\n", + proxy_url ? "" : "/", + urlpath, + proxy_url ? metaserver : "", + VERSION_STRING, client_string); +#endif /* HAVE_SYS_UTSNAME_H */ + #ifdef HAVE_FDOPEN f=fdopen(s,"r+"); fwrite(str,1,strlen(str),f); Index: client/gui-gtk/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/Makefile.in,v retrieving revision 1.18 diff -u -r1.18 Makefile.in --- client/gui-gtk/Makefile.in 2001/06/15 23:12:44 1.18 +++ client/gui-gtk/Makefile.in 2001/08/28 16:31:29 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -148,7 +148,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/chatline.P .deps/citydlg.P .deps/cityrep.P \ .deps/colors.P .deps/connectdlg.P .deps/dialogs.P .deps/diplodlg.P \ @@ -243,7 +243,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: client/gui-stub/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-stub/Makefile.in,v retrieving revision 1.6 diff -u -r1.6 Makefile.in --- client/gui-stub/Makefile.in 2001/06/15 23:12:44 1.6 +++ client/gui-stub/Makefile.in 2001/08/28 16:31:29 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -138,7 +138,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/chatline.P .deps/citydlg.P .deps/cityrep.P \ .deps/colors.P .deps/connectdlg.P .deps/dialogs.P .deps/diplodlg.P \ @@ -232,7 +232,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: client/gui-win32/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/Makefile.in,v retrieving revision 1.6 diff -u -r1.6 Makefile.in --- client/gui-win32/Makefile.in 2001/06/15 23:12:45 1.6 +++ client/gui-win32/Makefile.in 2001/08/28 16:31:29 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -116,7 +116,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -144,7 +144,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: client/gui-xaw/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/Makefile.in,v retrieving revision 1.17 diff -u -r1.17 Makefile.in --- client/gui-xaw/Makefile.in 2001/06/15 23:12:45 1.17 +++ client/gui-xaw/Makefile.in 2001/08/28 16:31:29 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -149,7 +149,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/actions.P .deps/canvas.P .deps/chatline.P \ .deps/citydlg.P .deps/cityrep.P .deps/colors.P .deps/connectdlg.P \ @@ -245,7 +245,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: client/include/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/include/Makefile.in,v retrieving revision 1.19 diff -u -r1.19 Makefile.in --- client/include/Makefile.in 2001/06/30 12:47:11 1.19 +++ client/include/Makefile.in 2001/08/28 16:31:29 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -116,7 +116,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -170,7 +170,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: common/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/common/Makefile.in,v retrieving revision 1.51 diff -u -r1.51 Makefile.in --- common/Makefile.in 2001/06/15 23:12:46 1.51 +++ common/Makefile.in 2001/08/28 16:31:29 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -141,7 +141,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/astring.P .deps/capability.P .deps/capstr.P \ .deps/city.P .deps/combat.P .deps/connection.P .deps/diptreaty.P \ @@ -238,7 +238,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: data/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/Makefile.in,v retrieving revision 1.33 diff -u -r1.33 Makefile.in --- data/Makefile.in 2001/06/15 23:12:47 1.33 +++ data/Makefile.in 2001/08/28 16:31:29 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -120,7 +120,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -253,7 +253,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: data/civ1/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/civ1/Makefile.in,v retrieving revision 1.13 diff -u -r1.13 Makefile.in --- data/civ1/Makefile.in 2001/06/15 23:12:47 1.13 +++ data/civ1/Makefile.in 2001/08/28 16:31:29 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -118,7 +118,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -165,7 +165,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: data/civ2/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/civ2/Makefile.in,v retrieving revision 1.10 diff -u -r1.10 Makefile.in --- data/civ2/Makefile.in 2001/06/15 23:12:48 1.10 +++ data/civ2/Makefile.in 2001/08/28 16:31:30 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -118,7 +118,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -165,7 +165,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: data/classic/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/classic/Makefile.in,v retrieving revision 1.11 diff -u -r1.11 Makefile.in --- data/classic/Makefile.in 2001/06/15 23:12:48 1.11 +++ data/classic/Makefile.in 2001/08/28 16:31:30 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -118,7 +118,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -165,7 +165,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: data/default/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/default/Makefile.in,v retrieving revision 1.24 diff -u -r1.24 Makefile.in --- data/default/Makefile.in 2001/06/15 23:12:49 1.24 +++ data/default/Makefile.in 2001/08/28 16:31:30 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -118,7 +118,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -165,7 +165,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: data/engels/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/engels/Makefile.in,v retrieving revision 1.8 diff -u -r1.8 Makefile.in --- data/engels/Makefile.in 2001/06/15 23:12:49 1.8 +++ data/engels/Makefile.in 2001/08/28 16:31:30 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -118,7 +118,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -165,7 +165,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: data/hires/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/hires/Makefile.in,v retrieving revision 1.3 diff -u -r1.3 Makefile.in --- data/hires/Makefile.in 2001/08/06 21:10:14 1.3 +++ data/hires/Makefile.in 2001/08/28 16:31:30 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -118,7 +118,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -165,7 +165,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: data/misc/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/misc/Makefile.in,v retrieving revision 1.7 diff -u -r1.7 Makefile.in --- data/misc/Makefile.in 2001/06/15 23:12:50 1.7 +++ data/misc/Makefile.in 2001/08/28 16:31:30 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -118,7 +118,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -165,7 +165,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: data/nation/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/nation/Makefile.in,v retrieving revision 1.11 diff -u -r1.11 Makefile.in --- data/nation/Makefile.in 2001/06/15 23:12:50 1.11 +++ data/nation/Makefile.in 2001/08/28 16:31:30 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -118,7 +118,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -165,7 +165,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: data/scenario/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/scenario/Makefile.in,v retrieving revision 1.7 diff -u -r1.7 Makefile.in --- data/scenario/Makefile.in 2001/06/15 23:12:52 1.7 +++ data/scenario/Makefile.in 2001/08/28 16:31:30 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -118,7 +118,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -165,7 +165,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: data/trident/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/data/trident/Makefile.in,v retrieving revision 1.12 diff -u -r1.12 Makefile.in --- data/trident/Makefile.in 2001/06/15 23:12:52 1.12 +++ data/trident/Makefile.in 2001/08/28 16:31:30 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -118,7 +118,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -165,7 +165,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: doc/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/doc/Makefile.in,v retrieving revision 1.10 diff -u -r1.10 Makefile.in --- doc/Makefile.in 2001/08/09 20:23:28 1.10 +++ doc/Makefile.in 2001/08/28 16:31:30 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -114,7 +114,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -142,7 +142,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ Index: server/Makefile.in =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/Makefile.in,v retrieving revision 1.34 diff -u -r1.34 Makefile.in --- server/Makefile.in 2001/06/15 23:12:59 1.34 +++ server/Makefile.in 2001/08/28 16:31:30 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -150,7 +150,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/autoattack.P .deps/barbarian.P .deps/cityhand.P \ .deps/citytools.P .deps/cityturn.P .deps/civserver.P .deps/console.P \ @@ -275,7 +275,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \