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)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 92e9e216d8a7351c9313012b6d3022f0d865fe01..9b4626895f47013cc6608926e18c2546352c974c 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -160,9 +160,6 @@ CHARSET_MODULES = @CHARSET_MODULES@
 AUTH_MODULES = @AUTH_MODULES@
 MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) $(CHARSET_MODULES) $(AUTH_MODULES)
 
-DAT_FILES = lowcase upcase valid
-SWAT_MSG_FILES = de en fr it ja nl pl tr
-
 ######################################################################
 # object file lists
 ######################################################################
@@ -1416,10 +1413,10 @@ installscripts: installdirs
        @$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
 
 installdat: installdirs
-       @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(LIBDIR) $(srcdir) $(DAT_FILES)
+       @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(LIBDIR) $(srcdir)
 
 installmsg: installdirs
-       @$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir) $(SWAT_MSG_FILES)
+       @$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir)
 
 installswat: installdirs installmsg
        @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
@@ -1517,10 +1514,10 @@ uninstallscripts:
        @$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
 
 uninstalldat:
-       @$(SHELL) $(srcdir)/script/uninstalldat.sh $(DESTDIR) $(LIBDIR) $(srcdir) $(DAT_FILES)
+       @$(SHELL) $(srcdir)/script/uninstalldat.sh $(DESTDIR) $(LIBDIR) $(srcdir)
 
 uninstallmsg:
-       @$(SHELL) $(srcdir)/script/uninstallmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir) $(SWAT_MSG_FILES)
+       @$(SHELL) $(srcdir)/script/uninstallmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir)
 
 uninstallswat: uninstallmsg
        @$(SHELL) $(srcdir)/script/uninstallswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)

diff --git a/source3/script/installdat.sh b/source3/script/installdat.sh
index 5d7958e27370cfa08b82b711338f7617b51ffae0..298b29452bc7c1ff1d2ad8420451ef30b3c07c92 100755 (executable)
--- 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 3bfa3ee772b0f43ae1ce4b00ebcc7f947845b420..612568bbce708362a1b26ce3cc9fa356c7925b8f 100644 (file)
--- 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"