Author: peters
Date: Sun Jun 26 20:49:40 2011
New Revision: 1139938
URL: http://svn.apache.org/viewvc?rev=1139938&view=rev
Log:
Followup r1139937 to fix a few bits I messed up.
* tools/dev/unix-build/Makefile.svn
($(GNU_ICONV_OBJDIR)/lib_encodings.def.diff,
$(GNU_ICONV_OBJDIR)/lib_aliases.gperf.diff): Use mv -f instead of mv.
($(HTTPD_CONF)): Truncate output file.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1139938&r1=1139937&r2=1139938&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Sun Jun 26 20:49:40 2011
@@ -377,7 +377,7 @@ $(GNU_ICONV_OBJDIR)/lib_encodings.def.di
echo >>[email protected] ' "ASCII", /* IANA, JDK
1.1 */'
echo >>[email protected] ' "ISO646-US", /* IANA */'
echo >>[email protected] ' "ISO_646.IRV:1991", /* IANA */'
- mv [email protected] $@
+ mv -f [email protected] $@
$(GNU_ICONV_OBJDIR)/lib_aliases.gperf.diff:
mkdir -p $(dirname $@)
@@ -391,7 +391,7 @@ $(GNU_ICONV_OBJDIR)/lib_aliases.gperf.di
echo >>[email protected] ' ASCII, ei_ascii'
echo >>[email protected] ' ISO646-US, ei_ascii'
echo >>[email protected] ' ISO_646.IRV:1991, ei_ascii'
- mv [email protected] $@
+ mv -f [email protected] $@
# retrieve gnu-iconv
# Add 646 as an alias for ASCII to fix prop_test 22 on OpenBSD
@@ -550,7 +550,7 @@ $(HTTPD_OBJDIR)/.installed: $(HTTPD_OBJD
# create a httpd.conf for mod_dav_svn
$(HTTPD_CONF):
mkdir -p $(dirname $@)
- echo >>[email protected] '# httpd config for use with mod_dav_svn'
+ echo > [email protected] '# httpd config for use with mod_dav_svn'
echo >>[email protected] 'ServerRoot "$(PREFIX)/httpd"'
echo >>[email protected] 'Listen localhost:8080'
echo >>[email protected] 'LoadModule dav_svn_module
modules/svn-$(WC)/mod_dav_svn.so'
