mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
remove ares/aclocal.m4 before cvs update to prevent bad conflicts
This commit is contained in:
parent
be6af69dc7
commit
863473a856
@ -180,6 +180,11 @@ cd $CURLDIR
|
|||||||
|
|
||||||
# Do the CVS thing, or not...
|
# Do the CVS thing, or not...
|
||||||
if [ $CVS -eq 1 ]; then
|
if [ $CVS -eq 1 ]; then
|
||||||
|
|
||||||
|
# this is a temporary fix to make things work again, remove later
|
||||||
|
log "remove ares/aclocal.m4"
|
||||||
|
rm -f ares/aclocal.m4
|
||||||
|
|
||||||
log "update from CVS"
|
log "update from CVS"
|
||||||
|
|
||||||
cvsup() {
|
cvsup() {
|
||||||
|
Loading…
Reference in New Issue
Block a user