subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pet...@apache.org
Subject svn commit: r1139938 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Date Sun, 26 Jun 2011 20:49:40 GMT
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 >>$@.tmp '               "ASCII",                  /* IANA, JDK 1.1 */'
 	echo >>$@.tmp '               "ISO646-US",              /* IANA */'
 	echo >>$@.tmp '               "ISO_646.IRV:1991",       /* IANA */'
-	mv $@.tmp $@
+	mv -f $@.tmp $@
 
 $(GNU_ICONV_OBJDIR)/lib_aliases.gperf.diff:
 	mkdir -p $(dirname $@)
@@ -391,7 +391,7 @@ $(GNU_ICONV_OBJDIR)/lib_aliases.gperf.di
 	echo >>$@.tmp ' ASCII, ei_ascii'
 	echo >>$@.tmp ' ISO646-US, ei_ascii'
 	echo >>$@.tmp ' ISO_646.IRV:1991, ei_ascii'
-	mv $@.tmp $@
+	mv -f $@.tmp $@
 
 # 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 >>$@.tmp '# httpd config for use with mod_dav_svn'
+	echo > $@.tmp '# httpd config for use with mod_dav_svn'
 	echo >>$@.tmp 'ServerRoot "$(PREFIX)/httpd"'
 	echo >>$@.tmp 'Listen localhost:8080'
 	echo >>$@.tmp 'LoadModule dav_svn_module modules/svn-$(WC)/mod_dav_svn.so'



Mime
View raw message