- fixed %%lang

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

diff --git a/apache-apxs_force_rm_cp.patch b/apache-apxs_force_rm_cp.patch
index 4f124e8b840b651b969e65607989827e783e5eca..6b9e9b0119771cc3688254714eb228e2f55cd7b5 100644 (file)
--- a/apache-apxs_force_rm_cp.patch
+++ b/apache-apxs_force_rm_cp.patch
@@ -1,25 +1,25 @@
 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
-@@ -424,7 +424,7 @@
-         my $t = $f;
-         $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");
+@@ -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");
+             }
          }
- 
-@@ -512,9 +512,9 @@
-             if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) {
+@@ -555,9 +555,9 @@
                  print FP $content;
                  close(FP);
--                system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
--                       "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
--                       "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
-+                system("cp -f $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
-+                       "cp -f $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
-+                       "rm -f $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
-             } else {
-                 print STDERR "apxs:Error: unable to open configuration file\n";
-             }
+                 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\"");