fix sanitization for gettext changes

4 files changed, 66 insertions, 26 deletions

diff --git a/ld/.Sanitize b/ld/.Sanitize
index b8e01ab..322888c 100644
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -1,4 +1,4 @@
-# .Sanitize for devo/ld.
+# .Sanitize for devo/ld
 
 # Each directory to survive its way into a release will need a file
 # like this one called "./.Sanitize".  All keyword lines must exist,
@@ -15,8 +15,9 @@
 
 Do-first:
 
+
 # All files listed between the "Things-to-keep:" line and the
-# "Files-to-sed:" line will be kept.  All other files will be removed.
+# "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
 # called.  Directories not listed will be removed in their entirety
 # with rm -rf.
@@ -30,8 +31,8 @@ NEWS
 README
 TODO
 acconfig.h
-aclocal.m4
 acinclude.m4
+aclocal.m4
 config.in
 configure
 configure.bat
@@ -41,10 +42,10 @@ configure.tgt
 dep-in.sed
 emulparams
 emultempl
+gen-doc.texi
 genscripts.sh
 h8-doc.texi
 ld.1
-gen-doc.texi
 ld.h
 ld.texinfo
 ldcref.c
@@ -74,12 +75,13 @@ lexsup.c
 mac-ld.r
 mpw-config.in
 mpw-elfmips.c
-mpw-idtmips.c
 mpw-eppcmac.c
 mpw-esh.c
+mpw-idtmips.c
 mpw-make.sed
 mri.c
 mri.h
+po
 scripttempl
 stamp-h.in
 sysdep.h
@@ -87,10 +89,15 @@ testsuite
 
 Things-to-lose:
 
+
+
+# The lines between the "Do-last:" line and the end of the file
+# are executed as a /bin/sh shell script after everything else is
+# done.
+
 Do-last:
 
 v850_files="ChangeLog configure.tgt Makefile.am Makefile.in"
-
 if ( echo $* | grep keep\-v850e > /dev/null ) ; then
 	for i in $v850_files ; do
 		if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
@@ -119,7 +126,6 @@ else
 fi
 
 tx49_files="ChangeLog configure.tgt"
-
 if ( echo $* | grep keep\-tx49 > /dev/null ) ; then
 	for i in $tx49_files ; do
 		if test ! -d $i && (grep sanitize-tx49 $i > /dev/null) ; then
@@ -148,7 +154,6 @@ else
 fi
 
 r5900_files="ChangeLog configure.tgt Makefile.in Makefile.am"
-
 if ( echo $* | grep keep\-r5900 > /dev/null ) ; then
 	for i in $r5900_files ; do
 		if test ! -d $i && (grep sanitize-r5900 $i > /dev/null) ; then
@@ -177,7 +182,6 @@ else
 fi
 
 vr4320_files="ChangeLog configure.tgt"
-
 if ( echo $* | grep keep\-vr4320 > /dev/null ) ; then
 	for i in $vr4320_files ; do
 		if test ! -d $i && (grep sanitize-vr4320 $i > /dev/null) ; then
@@ -206,7 +210,6 @@ else
 fi
 
 tic80_files="ChangeLog configure.tgt Makefile.am Makefile.in"
-
 if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
 	for i in $tic80_files ; do
 		if test ! -d $i && (grep sanitize-tic80 $i > /dev/null) ; then
@@ -235,7 +238,6 @@ else
 fi
 
 d30v_files="ChangeLog configure.tgt Makefile.am Makefile.in"
-
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
 	for i in $d30v_files ; do
 		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
@@ -264,7 +266,6 @@ else
 fi
 
 sky_files="ChangeLog configure.tgt"
-
 if ( echo $* | grep keep\-sky > /dev/null ) ; then
 	for i in $sky_files ; do
 		if test ! -d $i && (grep sanitize-sky $i > /dev/null) ; then
@@ -298,5 +299,4 @@ for i in * ; do
 	fi
 done
 
-#
-# End of file.
+# eof
diff --git a/ld/emulparams/.Sanitize b/ld/emulparams/.Sanitize
index 4f532f9..7401333 100644
--- a/ld/emulparams/.Sanitize
+++ b/ld/emulparams/.Sanitize
@@ -16,7 +16,6 @@
 Do-first:
 
 d30v_files="d30velf.sh d30v_o.sh d30v_e.sh"
-
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
 	keep_these_too="${d30v_files} ${keep_these_too}"
 else
@@ -24,7 +23,6 @@ else
 fi
 
 tic80_files="tic80coff.sh"
-
 if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
 	keep_these_too="${tic80_files} ${keep_these_too}"
 else
@@ -32,7 +30,6 @@ else
 fi
 
 r5900_files="elf32l5900.sh"
-
 if ( echo $* | grep keep\-r5900 > /dev/null ) ; then
 	keep_these_too="${r5900_files} ${keep_these_too}"
 else
@@ -62,18 +59,18 @@ d10velf.sh
 delta68.sh
 ebmon29k.sh
 elf32_sparc.sh
+elf32b4300.sh
 elf32bmip.sh
 elf32bsmip.sh
 elf32ebmip.sh
 elf32elmip.sh
+elf32l4300.sh
 elf32lmip.sh
 elf32lppc.sh
 elf32lsmip.sh
 elf32ppc.sh
-elf32b4300.sh
-elf32l4300.sh
-elf64alpha.sh
 elf64_sparc.sh
+elf64alpha.sh
 elf_i386.sh
 gld960.sh
 gld960coff.sh
@@ -152,6 +149,8 @@ z8002.sh
 
 Things-to-lose:
 
+
+
 # The lines between the "Do-last:" line and the end of the file
 # are executed as a /bin/sh shell script after everything else is
 # done.
@@ -159,7 +158,6 @@ Things-to-lose:
 Do-last:
 
 v850e_files="v850.sh"
-
 if ( echo $* | grep keep\-v850e > /dev/null ) ; then
 	for i in $v850e_files ; do
 		if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
@@ -187,3 +185,4 @@ else
 	done
 fi
 
+# eof
diff --git a/ld/po/.Sanitize b/ld/po/.Sanitize
new file mode 100644
index 0000000..f46fd6a
--- /dev/null
+++ b/ld/po/.Sanitize
@@ -0,0 +1,41 @@
+# .Sanitize for devo/ld/po
+
+# Each directory to survive its way into a release will need a file
+# like this one called "./.Sanitize".  All keyword lines must exist,
+# and must exist in the order specified by this file.  Each directory
+# in the tree will be processed, top down, in the following order.
+
+# Hash started lines like this one are comments and will be deleted
+# before anything else is done.  Blank lines will also be squashed
+# out.
+
+# The lines between the "Do-first:" line and the "Things-to-keep:"
+# line are executed as a /bin/sh shell script before anything else is
+# done in this directory.
+
+Do-first:
+
+
+# All files listed between the "Things-to-keep:" line and the
+# "Do-last:" line will be kept.  All other files will be removed.
+# Directories listed in this section will have their own Sanitize
+# called.  Directories not listed will be removed in their entirety
+# with rm -rf.
+
+Things-to-keep:
+
+Make-in
+POTFILES.in
+ld.pot
+
+Things-to-lose:
+
+
+
+# The lines between the "Do-last:" line and the end of the file
+# are executed as a /bin/sh shell script after everything else is
+# done.
+
+Do-last:
+
+# eof
diff --git a/ld/scripttempl/.Sanitize b/ld/scripttempl/.Sanitize
index 098fff6..aa7fe54 100644
--- a/ld/scripttempl/.Sanitize
+++ b/ld/scripttempl/.Sanitize
@@ -1,4 +1,4 @@
-# .Sanitize for devo/ld/scripttempl.
+# .Sanitize for devo/ld/scripttempl
 
 # Each directory to survive its way into a release will need a file
 # like this one called "./.Sanitize".  All keyword lines must exist,
@@ -16,7 +16,6 @@
 Do-first:
 
 d30v_files="elfd30v.sc"
-
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
 	keep_these_too="${d30v_files} ${keep_these_too}"
 else
@@ -24,7 +23,6 @@ else
 fi
 
 tic80_files="tic80coff.sc"
-
 if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
 	keep_these_too="${tic80_files} ${keep_these_too}"
 else
@@ -43,9 +41,9 @@ README
 a29k.sc
 aix.sc
 alpha.sc
+aout.sc
 armaout.sc
 armcoff.sc
-aout.sc
 delta68.sc
 ebmon29k.sc
 elf.sc
@@ -91,6 +89,8 @@ z8000.sc
 
 Things-to-lose:
 
+
+
 # The lines between the "Do-last:" line and the end of the file
 # are executed as a /bin/sh shell script after everything else is
 # done.
@@ -98,7 +98,6 @@ Things-to-lose:
 Do-last:
 
 v850_files="v850.sc"
-
 if ( echo $* | grep keep\-v850e > /dev/null ) ; then
 	for i in $v850_files ; do
 		if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then
@@ -126,3 +125,4 @@ else
 	done
 fi
 
+# eof