coreutils-5.0-hostname.patch

Jouko Orava joorava at pcu.helsinki.fi
Wed Jun 11 09:58:25 PDT 2003


Noticed that both the original coreutils-5.0-hostname.patch
and the version I sent earlier ignored the automake Makefiles,
src/Makefile.am and man/Makefile.am .

Regenerating the configuration files would remove the patch.
Probably nobody ever does that, but here is the updated patch anyway.

Jouko
-------------- next part --------------
diff -Naur orig.coreutils-5.0/man/Makefile.am coreutils-5.0/man/Makefile.am
--- orig.coreutils-5.0/man/Makefile.am	Wed Apr  2 13:19:34 2003
+++ coreutils-5.0/man/Makefile.am	Wed Jun 11 19:26:37 2003
@@ -3,7 +3,7 @@
   basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \
   cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \
   echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \
-  head.1 hostid.1 hostname.1 id.1 install.1 join.1 link.1 ln.1 logname.1 \
+  head.1 hostid.1 id.1 install.1 join.1 link.1 ln.1 logname.1 \
   ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
   paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
   rm.1 rmdir.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
diff -Naur orig.coreutils-5.0/man/Makefile.in coreutils-5.0/man/Makefile.in
--- orig.coreutils-5.0/man/Makefile.in	Wed Apr  2 17:28:42 2003
+++ coreutils-5.0/man/Makefile.in	Wed Jun 11 19:25:17 2003
@@ -152,7 +152,7 @@
   basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \
   cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \
   echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \
-  head.1 hostid.1 hostname.1 id.1 install.1 join.1 link.1 ln.1 logname.1 \
+  head.1 hostid.1 id.1 install.1 join.1 link.1 ln.1 logname.1 \
   ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
   paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
   rm.1 rmdir.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
@@ -482,8 +482,8 @@
 	PATH=../src at PATH_SEPARATOR@$$PATH; export PATH;			\
 	t=ls-files.$$$$;						\
 	(cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | sort > $$t;	\
-	echo $(dist_man_MANS) | fmt -w1 | sed 's/\.1$$//' | sort -u	\
-	  | diff - $$t || { rm $$t; exit 1; };				\
+	echo $(dist_man_MANS) hostname.1 | fmt -w1 | sed 's/\.1$$//'	\
+	  | sort -u | diff - $$t || { rm $$t; exit 1; };		\
 	rm $$t
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur orig.coreutils-5.0/src/Makefile.am coreutils-5.0/src/Makefile.am
--- orig.coreutils-5.0/src/Makefile.am	Wed Apr  2 13:20:10 2003
+++ coreutils-5.0/src/Makefile.am	Wed Jun 11 19:25:17 2003
@@ -10,7 +10,7 @@
   cat cksum comm csplit cut expand fmt fold head join md5sum \
   nl od paste pr ptx sha1sum sort split sum tac tail tr tsort unexpand uniq wc \
   basename date dirname echo env expr factor false \
-  hostname id kill logname pathchk printenv printf pwd seq sleep tee \
+  id kill logname pathchk printenv printf pwd seq sleep tee \
   test true tty whoami yes \
   @OPTIONAL_BIN_PROGS@ @DF_PROG@
 
diff -Naur orig.coreutils-5.0/src/Makefile.in coreutils-5.0/src/Makefile.in
--- orig.coreutils-5.0/src/Makefile.in	Wed Apr  2 17:46:19 2003
+++ coreutils-5.0/src/Makefile.in	Wed Jun 11 19:25:17 2003
@@ -165,7 +165,7 @@
   cat cksum comm csplit cut expand fmt fold head join md5sum \
   nl od paste pr ptx sha1sum sort split sum tac tail tr tsort unexpand uniq wc \
   basename date dirname echo env expr factor false \
-  hostname id kill logname pathchk printenv printf pwd seq sleep tee \
+  id kill logname pathchk printenv printf pwd seq sleep tee \
   test true tty whoami yes \
   @OPTIONAL_BIN_PROGS@ @DF_PROG@
 
@@ -305,7 +305,7 @@
 	tac$(EXEEXT) tail$(EXEEXT) tr$(EXEEXT) tsort$(EXEEXT) \
 	unexpand$(EXEEXT) uniq$(EXEEXT) wc$(EXEEXT) basename$(EXEEXT) \
 	date$(EXEEXT) dirname$(EXEEXT) echo$(EXEEXT) env$(EXEEXT) \
-	expr$(EXEEXT) factor$(EXEEXT) false$(EXEEXT) hostname$(EXEEXT) \
+	expr$(EXEEXT) factor$(EXEEXT) false$(EXEEXT) \
 	id$(EXEEXT) kill$(EXEEXT) logname$(EXEEXT) pathchk$(EXEEXT) \
 	printenv$(EXEEXT) printf$(EXEEXT) pwd$(EXEEXT) seq$(EXEEXT) \
 	sleep$(EXEEXT) tee$(EXEEXT) test$(EXEEXT) true$(EXEEXT) \
@@ -1534,7 +1534,7 @@
 .PHONY: check-README
 check-README:
 	rm -rf $(pr) $(pm)
-	echo $(all_programs) \
+	echo $(all_programs) hostname \
 	  | tr -s ' ' '\n' | sort -u > $(pm)
 	sed -n '/^The programs .* are:/,/^[a-zA-Z]/p' $(top_srcdir)/README \
 	  | sed -n '/^   */s///p' | tr -s ' ' '\n' > $(pr)


More information about the lfs-dev mailing list