From 21760b0001d5ab645c15a730c543ee870753e419 Mon Sep 17 00:00:00 2001
From: Lars Müller <lmuelle@samba.org>
Date: Sat, 25 Feb 2006 17:58:52 +0000
Subject: r13688: Revert change to set DAT_FILES and SWAT_MSG_FILES in the
 Makefile. Instead check for *.dat and *.msg files as done before.  Then added
 files are installed and removed as soon as we have some in the filesystem. 
 It's simpler and less error prone. (This used to be commit
 5119472cdcdc4a0e422d49290c3007527fefd6a2)

---
 source3/script/installdat.sh | 10 +++++-----
 source3/script/installmsg.sh | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'source3/script')

diff --git a/source3/script/installdat.sh b/source3/script/installdat.sh
index 5d7958e273..298b29452b 100755
--- a/source3/script/installdat.sh
+++ b/source3/script/installdat.sh
@@ -20,16 +20,16 @@ case $0 in
 	*) mode='install' ;;    
 esac
 
-for f in $@; do
-	FNAME="$DESTDIR/$DATDIR/$f.dat"
+for f in $SRCDIR/codepages/*.dat; do
+	FNAME="$DESTDIR/$DATDIR/`basename $f`"
 	if test "$mode" = 'install'; then
-		echo "Installing $f.dat as $FNAME "
-		cp "$SRCDIR/codepages/$f.dat" "$FNAME"
+		echo "Installing $f as $FNAME "
+		cp "$f" "$FNAME"
 		if test ! -e "$FNAME"; then
 			echo "Cannot install $FNAME.  Does $USER have privileges? "
 			exit 1
 		fi
-		chmod 0644 $FNAME
+		chmod 0644 "$FNAME"
 	elif test "$mode" = 'uninstall'; then
 		echo "Removing $FNAME "
 		rm -f "$FNAME"
diff --git a/source3/script/installmsg.sh b/source3/script/installmsg.sh
index 3bfa3ee772..612568bbce 100644
--- a/source3/script/installmsg.sh
+++ b/source3/script/installmsg.sh
@@ -21,16 +21,16 @@ case $0 in
 	*) mode='install' ;;
 esac
 
-for f in $@; do
-	FNAME="$DESTDIR/$MSGDIR/$f.msg"
+for f in $SRCDIR/po/*.msg; do
+	FNAME="$DESTDIR/$MSGDIR/`basename $f`"
 	if test "$mode" = 'install'; then
-		echo "Installing $f.msg as $FNAME "
-		cp "$SRCDIR/po/$f.msg" "$FNAME"
+		echo "Installing $f as $FNAME "
+		cp "$f" "$FNAME"
 		if test ! -e "$FNAME"; then
 			echo "Cannot install $FNAME.  Does $USER have privileges? "
 			exit 1
 		fi
-		chmod 0644 $FNAME
+		chmod 0644 "$FNAME"
 	elif test "$mode" = 'uninstall'; then
 		echo "Removing $FNAME "
 		rm -f "$FNAME"
-- 
cgit