diff options
| -rw-r--r-- | source3/Makefile.in | 11 | ||||
| -rwxr-xr-x | source3/script/installdat.sh | 10 | ||||
| -rw-r--r-- | source3/script/installmsg.sh | 10 |
3 files changed, 14 insertions, 17 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 92e9e216d8..9b4626895f 100644 --- 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 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" |