|
|
Author: lmuelle
Date: 2006-02-25 17:58:52 +0000 (Sat, 25 Feb 2006)
New Revision: 13688
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13688
Log:
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.
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/script/installdat.sh
branches/SAMBA_3_0/source/script/installmsg.sh
trunk/source/Makefile.in
trunk/source/script/installdat.sh
trunk/source/script/installmsg.sh
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in 2006-02-25 12:27:15 UTC (rev
13687)
+++ branches/SAMBA_3_0/source/Makefile.in 2006-02-25 17:58:52 UTC (rev
13688)
@@ -160,9 +160,6 @@
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 @@
@$(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 @@
@$(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)
Modified: branches/SAMBA_3_0/source/script/installdat.sh
===================================================================
--- branches/SAMBA_3_0/source/script/installdat.sh 2006-02-25 12:27:15 UTC
(rev 13687)
+++ branches/SAMBA_3_0/source/script/installdat.sh 2006-02-25 17:58:52 UTC
(rev 13688)
@@ -20,16 +20,16 @@
*) 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"
Modified: branches/SAMBA_3_0/source/script/installmsg.sh
===================================================================
--- branches/SAMBA_3_0/source/script/installmsg.sh 2006-02-25 12:27:15 UTC
(rev 13687)
+++ branches/SAMBA_3_0/source/script/installmsg.sh 2006-02-25 17:58:52 UTC
(rev 13688)
@@ -21,16 +21,16 @@
*) 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"
Modified: trunk/source/Makefile.in
===================================================================
--- trunk/source/Makefile.in 2006-02-25 12:27:15 UTC (rev 13687)
+++ trunk/source/Makefile.in 2006-02-25 17:58:52 UTC (rev 13688)
@@ -160,9 +160,6 @@
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
######################################################################
@@ -1445,10 +1442,10 @@
@$(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)
@@ -1546,10 +1543,10 @@
@$(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)
Modified: trunk/source/script/installdat.sh
===================================================================
--- trunk/source/script/installdat.sh 2006-02-25 12:27:15 UTC (rev 13687)
+++ trunk/source/script/installdat.sh 2006-02-25 17:58:52 UTC (rev 13688)
@@ -20,16 +20,16 @@
*) 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"
Modified: trunk/source/script/installmsg.sh
===================================================================
--- trunk/source/script/installmsg.sh 2006-02-25 12:27:15 UTC (rev 13687)
+++ trunk/source/script/installmsg.sh 2006-02-25 17:58:52 UTC (rev 13688)
@@ -21,16 +21,16 @@
*) 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"
|
|