diff --git a/.gitattributes b/.gitattributes index 30a4d9102ee5110a307d3604467bbc75a9d06151..6387d6aee78f25ab200efb7a8fe9d7f7f7d45a60 100644 --- a/.gitattributes +++ b/.gitattributes @@ -74,6 +74,7 @@ testfont binary /lib/modules/Sql.pmod/sql.pike foreign_ident /lib/modules/Sql.pmod/sql_result.pike foreign_ident /lib/modules/Stdio.pmod foreign_ident +/lib/modules/Stdio.pmod/module.pmod foreign_ident /lib/modules/Yabu.pmod/module.pmod foreign_ident /lib/modules/error.pmod foreign_ident /man/hilfe.1 foreign_ident diff --git a/bin/install.pike b/bin/install.pike index 295d2372af1eba74cc76dbf52d2ae9bf2399d5fe..764e62ad5f3fb39eb8c1677c941f2466405cd3f0 100644 --- a/bin/install.pike +++ b/bin/install.pike @@ -36,8 +36,9 @@ int mkdirhier(string dir) if(s[1]<0) return 1; - werror("mkdir: Directory '%s' already exists as a file.\n",dir); - exit(1); + werror("Warning: Directory '%s' already exists as a file.\n",dir); + if(!mv(dir,dir+".old")) + fail("mv(%s,%s)",tmpfile,to); } mkdirhier(dirname(dir)); diff --git a/lib/modules/Stdio.pmod b/lib/modules/Stdio.pmod/module.pmod similarity index 99% rename from lib/modules/Stdio.pmod rename to lib/modules/Stdio.pmod/module.pmod index 3386138d9e205accc403a7fd4770750c989be0aa..59aa9914382fc999cac03cbe6ecd98ada40fe1ea 100644 --- a/lib/modules/Stdio.pmod +++ b/lib/modules/Stdio.pmod/module.pmod @@ -1,4 +1,4 @@ -// $Id: Stdio.pmod,v 1.37 1999/01/30 01:35:08 grubba Exp $ +// $Id: module.pmod,v 1.37 1999/03/11 22:31:05 hubbe fake $ #include <string.h>