rel 15; builds

[packages/apache1.git] / apache1-apxs_force_rm_cp.patch

diff -Nru apache_1.3.12/src/support/apxs.pl apache_1.3.12.new/src/support/apxs.pl
--- apache_1.3.12/src/support/apxs.pl	Mon Jun 12 18:37:55 2000
+++ apache_1.3.12.new/src/support/apxs.pl	Mon Jun 12 18:39:53 2000
@@ -459,7 +459,7 @@
         if ($^O ne "MSWin32") {
             $t =~ s|^.+/([^/]+)$|$1|;
             if ($opt_i) {
-                push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
+                push(@cmds, "cp -f $f $CFG_LIBEXECDIR/$t");
                 push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
             }
         }
@@ -555,9 +555,9 @@
                 print FP $content;
                 close(FP);
                 if ($^O ne "MSWin32") {
-                    push(@cmds, "cp $cfgbase.conf $cfgbase.conf.bak");
-                    push(@cmds, "cp $cfgbase.conf.new $cfgbase.conf");
-                    push(@cmds, "rm $cfgbase.conf.new");
+                    push(@cmds, "cp -f $cfgbase.conf $cfgbase.conf.bak");
+                    push(@cmds, "cp -f $cfgbase.conf.new $cfgbase.conf");
+                    push(@cmds, "rm -f $cfgbase.conf.new");
                 } else {
                     $cfgbase =~ s|/|\\|g;
                     push(@cmds, "copy \"$cfgbase.conf\" \"$cfgbase.conf.bak\"");