|
1 Patch origin: in-house |
|
2 Patch status: Solaris-specific; not suitable for upstream |
|
3 |
|
4 --- Makefile.in.orig Fri Apr 15 07:23:41 2011 |
|
5 +++ Makefile.in Fri Apr 15 07:23:53 2011 |
|
6 @@ -62,11 +62,19 @@ |
|
7 |
|
8 # Create apr-config script suitable for the install tree |
|
9 apr-config.out: $(APR_CONFIG) |
|
10 - sed 's,^\(location=\).*$$,\1installed,' < $(APR_CONFIG) > $@ |
|
11 + sed -e 's,^\(location=\).*$$,\1installed,' \ |
|
12 + -e '/^CC=/s,/.*/,,' \ |
|
13 + -e '/^CPP=/s,/.*/,,' \ |
|
14 + -e '/^APR_SOURCE_DIR=/s,/.*",/usr/apr/1.5",' \ |
|
15 + -e '/^APR_BUILD_DIR=/s,/.*",/usr/apr/1.5",' \ |
|
16 + < $(APR_CONFIG) > $@ |
|
17 |
|
18 # Create apr_rules.mk suitable for the install tree |
|
19 build/apr_rules.out: build/apr_rules.mk |
|
20 - sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@ |
|
21 + sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' \ |
|
22 + -e '/^CC=/s,/.*/,,' \ |
|
23 + -e '/^MKDEP = /s,/.*/,,' \ |
|
24 + < build/apr_rules.mk > $@ |
|
25 |
|
26 install: $(TARGETS) |
|
27 $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \ |
|
28 @@ -79,7 +87,13 @@ |
|
29 $(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp |
|
30 $(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE) |
|
31 for f in libtool shlibtool; do \ |
|
32 - if test -f $${f}; then $(INSTALL) -m 755 $${f} $(DESTDIR)$(installbuilddir); fi; \ |
|
33 + if test -f $${f}; then \ |
|
34 + sed -e '/^LTCC=/s,/.*/,,' \ |
|
35 + -e '/^CC=/s,/.*/,,' \ |
|
36 + < $${f} > $${f}.out; \ |
|
37 + $(INSTALL) -m 755 $${f}.out $(DESTDIR)$(installbuilddir)/$${f}; \ |
|
38 + rm $${f}.out; \ |
|
39 + fi; \ |
|
40 done |
|
41 $(INSTALL) -m 755 $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir) |
|
42 for f in make_exports.awk make_var_export.awk; do \ |