2002-11-20 Roland McGrath <roland@redhat.com>

	* intl/tst-gettext.sh: Use mkdir -p.  Copy test files unconditionally,
	so aborted prior runs don't confuse things.

diff --git a/intl/tst-gettext.sh b/intl/tst-gettext.sh
index 91abd38..cf6f6f3 100755 (executable)
--- a/intl/tst-gettext.sh
+++ b/intl/tst-gettext.sh
@@ -27,26 +27,19 @@ LC_ALL=C
 export LC_ALL
 
 # Generate the test data.
-test -d ${objpfx}domaindir || mkdir ${objpfx}domaindir
-test -d ${objpfx}localedir || mkdir ${objpfx}localedir
-# Create the domain directories.
-test -d ${objpfx}domaindir/existing-locale || mkdir ${objpfx}domaindir/existing-locale
-test -d ${objpfx}domaindir/existing-locale/LC_MESSAGES || mkdir ${objpfx}domaindir/existing-locale/LC_MESSAGES
-test -d ${objpfx}domaindir/existing-locale/LC_TIME || mkdir ${objpfx}domaindir/existing-locale/LC_TIME
+
 # Create the locale directories.
-test -d ${objpfx}localedir/existing-locale || {
-  mkdir ${objpfx}localedir/existing-locale
-  for f in ADDRESS COLLATE CTYPE IDENTIFICATION MEASUREMENT MONETARY NAME NUMERIC PAPER TELEPHONE TIME; do
-    cp ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_$f \
-       ${objpfx}localedir/existing-locale
-  done
-}
-test -d ${objpfx}localedir/existing-locale/LC_MESSAGES || {
-  mkdir ${objpfx}localedir/existing-locale/LC_MESSAGES
-  cp ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
-     ${objpfx}localedir/existing-locale/LC_MESSAGES
-}
+mkdir -p ${objpfx}localedir/existing-locale/LC_MESSAGES
+for f in ADDRESS COLLATE CTYPE IDENTIFICATION MEASUREMENT MONETARY NAME NUMERIC PAPER TELEPHONE TIME; do
+  cp -f ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_$f \
+        ${objpfx}localedir/existing-locale
+done
+cp -f ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
+      ${objpfx}localedir/existing-locale/LC_MESSAGES
 
+# Create the domain directories.
+mkdir -p ${objpfx}domaindir/existing-locale/LC_MESSAGES
+mkdir -p ${objpfx}domaindir/existing-locale/LC_TIME
 # Populate them.
 msgfmt -o ${objpfx}domaindir/existing-locale/LC_MESSAGES/existing-domain.mo \
        -f ../po/de.po