I installed the following patch to remove fetish to coreutils in a few
more places. The only nontrivial bit here is removing fetish.sf.net
from some URL lists; I assume that's obsolete now?
2005-04-18 Paul Eggert [EMAIL PROTECTED]
fetish - coreutils in several places.
* Makefile.cfg (ftp): Remove fetish.sf.net.
* Makefile.maint (emit_upload_commands): Likewise.
* src/Makefile.am (LDADD, $(PROGRAMS)): fetish - coreutils.
* tests/group-names (COREUTILS_GROUPS): Renamed from FETISH_GROUPS.
* tests/chmod/setgid (FETISH_GROUP): Renamed from COREUTILS_GROUP.
* lib/Makefile.am (noinst_LIBRARIES): fetish - coreutils.
(libcoreutils_a_SOURCES): Renamed from libfetish_a_SOURCES.
All uses changed.
(libcoreutils_a_LIBADD): Renamed from libfetish_a_LIBADD.
All uses changed.
(libcoreutils_a_DEPENDENCIES): Renamed from libfetish_a_DEPENDENCIES.
All uses changed.
* lib/chdir-long.c: fetish-coreutils in comment.
* lib/t-chdir-long: fetish-coreutils in compilation command.
* m4/clock_time.m4 (gl_CLOCK_TIME): Use gl_ rather than fetish_ for
variable names.
* m4/jm-macros.m4 (gl_MACROS): Use gl_ or coreutils_ rather than fetish_
for prefixes.
* m4/rmdir-errno.m4 (gl_FUNC_RMDIR_NOTEMPTY): Renamed from
fetish_FUNC_RMDIR_NOTEMPTY. All uses changed. Use gl_ for
variable prefixes.
Index: Makefile.cfg
===
RCS file: /fetish/cu/Makefile.cfg,v
retrieving revision 1.22
diff -p -u -r1.22 Makefile.cfg
--- Makefile.cfg22 Mar 2005 16:17:50 - 1.22
+++ Makefile.cfg18 Apr 2005 23:29:32 -
@@ -24,8 +24,7 @@ gnu_ftp_host-major = ftp.gnu.org
gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
url_dir_list = \
- ftp://$(gnu_rel_host)/gnu/coreutils \
- http://fetish.sf.net
+ ftp://$(gnu_rel_host)/gnu/coreutils
# Files to update automatically.
wget_files = \
Index: Makefile.maint
===
RCS file: /fetish/cu/Makefile.maint,v
retrieving revision 1.199
diff -p -u -r1.199 Makefile.maint
--- Makefile.maint 9 Apr 2005 07:24:49 - 1.199
+++ Makefile.maint 18 Apr 2005 23:29:33 -
@@ -555,7 +555,6 @@ emit_upload_commands:
@echo =
@echo =
@echo $(srcdir)/gnupload $(GNUPLOADFLAGS) \\
- @echo --to fetish.sf.net:fetish-ftp \\
@echo --to $(gnu_rel_host):coreutils \\
@echo $(rel-files)
@echo '# send the /tmp/announcement e-mail'
Index: lib/Makefile.am
===
RCS file: /fetish/cu/lib/Makefile.am,v
retrieving revision 1.218
diff -p -u -r1.218 Makefile.am
--- lib/Makefile.am 11 Apr 2005 20:03:40 - 1.218
+++ lib/Makefile.am 18 Apr 2005 23:29:33 -
@@ -17,7 +17,7 @@
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-noinst_LIBRARIES = libfetish.a
+noinst_LIBRARIES = libcoreutils.a
noinst_PROGRAMS = t-fpending
LDADD = $(noinst_LIBRARIES)
@@ -25,7 +25,7 @@ LDADD = $(noinst_LIBRARIES)
AM_CPPFLAGS = -I.. -I$(srcdir)
DEFS += -DLIBDIR=\$(libdir)\
-libfetish_a_SOURCES = \
+libcoreutils_a_SOURCES = \
allocsa.c allocsa.h \
dev-ino.h \
diacrit.c diacrit.h \
@@ -53,16 +53,16 @@ libfetish_a_SOURCES = \
xstrtoimax.c \
xstrtoumax.c
-libfetish_a_SOURCES += \
+libcoreutils_a_SOURCES += \
printf-args.h \
printf-parse.h \
vasprintf.h \
vasnprintf.h
-libfetish_a_LIBADD = $(LIBOBJS) $(ALLOCA)
-libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
+libcoreutils_a_LIBADD = $(LIBOBJS) $(ALLOCA)
+libcoreutils_a_DEPENDENCIES = $(libcoreutils_a_LIBADD)
-lib_OBJECTS = $(libfetish_a_OBJECTS)
+lib_OBJECTS = $(libcoreutils_a_OBJECTS)
BUILT_SOURCES = getdate.c
Index: lib/chdir-long.c
===
RCS file: /fetish/cu/lib/chdir-long.c,v
retrieving revision 1.5
diff -p -u -r1.5 chdir-long.c
--- lib/chdir-long.c3 Feb 2005 21:33:02 - 1.5
+++ lib/chdir-long.c18 Apr 2005 23:29:33 -
@@ -269,6 +269,6 @@ main (int argc, char *argv[])
/*
Local Variables:
-compile-command: gcc -DTEST_CHDIR=1 -DHAVE_CONFIG_H -I.. -g -O -W -Wall
chdir-long.c libfetish.a
+compile-command: gcc -DTEST_CHDIR=1 -DHAVE_CONFIG_H -I.. -g -O -W -Wall
chdir-long.c libcoreutils.a
End:
*/
Index: lib/t-chdir-long
===
RCS file: /fetish/cu/lib/t-chdir-long,v
retrieving revision 1.4
diff -p -u -r1.4 t-chdir-long
--- lib/t-chdir-long19 Jan 2005 12:52:15 - 1.4
+++ lib/t-chdir-long18 Apr 2005 23:29:33 -
@@ -4,7 +4,8 @@
# temporary directories are easier to remove.
# FIXME: don't clobber a.out
-gcc -DTEST_CHDIR=1 -DHAVE_CONFIG_H
