summaryrefslogtreecommitdiff
path: root/www/apache/patches/patch-ai
blob: 788add413498f8aa087c3363b0380252c4e2865a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
$NetBSD: patch-ai,v 1.12 2013/03/02 17:52:33 joerg Exp $

--- src/support/apxs.pl.orig	2008-02-23 04:22:56.000000000 +0000
+++ src/support/apxs.pl
@@ -371,11 +371,7 @@ if ($opt_c) {
     $opt = '';
     my ($opt_Wl, $opt_L, $opt_l);
     foreach $opt_Wl (@opt_W) {
-        if ($CFG_LD_SHLIB !~ m/gcc$/) {
-            $opt .= " $1" if ($opt_Wl =~ m|^\s*l,(.*)$|);
-        } else {
-            $opt .= " -W$opt_Wl";
-        }
+        $opt .= " -W$opt_Wl";
     }
     foreach $opt_L (@opt_L) {
         if ($^O ne "MSWin32") {
@@ -424,8 +420,7 @@ if ($opt_i or $opt_e) {
         if ($^O ne "MSWin32") {
             $t =~ s|^.+/([^/]+)$|$1|;
             if ($opt_i) {
-                push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
-                push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
+                push(@cmds, "@INSTALL@ $f $CFG_LIBEXECDIR/$t");
             }
         }
 	else {