diff options
| author | Martin Kraemer <martin@apache.org> | 2001-04-27 15:30:21 +0000 |
|---|---|---|
| committer | Martin Kraemer <martin@apache.org> | 2001-04-27 15:30:21 +0000 |
| commit | 3aa010a8a0b1af49b7ea64c80957bd7fffbcaa6b (patch) | |
| tree | 2ea43abe536c868a5c8ecd77b10514a8d6b261be | |
| parent | 7bb4bfdf69c3987f066a84b2d3de56b3305b9660 (diff) | |
| download | httpd-3aa010a8a0b1af49b7ea64c80957bd7fffbcaa6b.tar.gz | |
Fix APXS: treat sbindir as expected, fix "link" command.
Submitted by: GOMEZ Henri <hgomez@slib.fr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88951 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | support/apxs.in | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/support/apxs.in b/support/apxs.in index baac1044d0..fc04758a72 100644 --- a/support/apxs.in +++ b/support/apxs.in @@ -73,7 +73,7 @@ my $CFG_PREFIX = "@prefix@"; my $prefix = "$CFG_PREFIX"; my $CFG_EXEC_PREFIX = "@exec_prefix@"; my $exec_prefix = "$CFG_EXEC_PREFIX"; -my $CFG_SBINDIR = "@bindir@"; +my $CFG_SBINDIR = "@sbindir@"; my $CFG_INCLUDEDIR = "@includedir@"; my $CFG_LIBEXECDIR = "@libexecdir@"; my $CFG_SYSCONFDIR = "@sysconfdir@"; @@ -372,6 +372,7 @@ if ($opt_c) { } my $cflags = "$CFG_CFLAGS"; my $s; + my $mod; foreach $s (@srcs) { my $slo = $s; $slo =~ s|\.c$|.slo|; @@ -379,11 +380,21 @@ if ($opt_c) { $lo =~ s|\.c$|.lo|; my $la = $s; $la =~ s|\.c$|.la|; - push(@cmds, "libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c $s && touch $slo"); - push(@cmds, "libtool --silent --mode=link $CFG_CC $cflags -o $la -rpath $CFG_LIBEXECDIR -module -avoid-version $lo"); + my $o = $s; + $o =~ s|\.c$|.o|; + push(@cmds, "libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo"); + unshift(@objs, $lo); + } + # create link command + my $o; + my $lo; + foreach $o (@objs) { + $lo .= " $o"; } + push(@cmds, "libtool --silent --mode=link $CFG_CC $cflags -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $lo"); + # execute the commands &execute_cmds(@cmds); |