Author: csutherl
Date: Thu Jan 10 18:24:23 2019
New Revision: 1850972
URL: http://svn.apache.org/viewvc?rev=1850972&view=rev
Log:
Update includedir name to tomcat-native instead of apr
Modified:
tomcat/native/trunk/native/build/rpm/tcnative.spec.in
tomcat/native/trunk/native/config.layout
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/build/rpm/tcnative.spec.in
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/rpm/tcnative.spec.in?rev=1850972&r1=1850971&r2=1850972&view=diff
==============================================================================
--- tomcat/native/trunk/native/build/rpm/tcnative.spec.in (original)
+++ tomcat/native/trunk/native/build/rpm/tcnative.spec.in Thu Jan 10 18:24:23
2019
@@ -50,7 +50,7 @@ contains additional utility interfaces f
%build
%configure --with-apr=%{_prefix} \
- --includedir=%{_includedir}/apr-%{aprmajor}
+ --includedir=%{_includedir}/%{name}
make %{?_smp_mflags} && make dox
%check
@@ -87,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libtcnative-%{tcnver}.*a
%{_libdir}/libtcnative-%{tcnver}.so
%{_libdir}/pkgconfig/tcnative-%{tcnver}.pc
-%{_includedir}/apr-%{aprmajor}/*.h
+%{_includedir}/%{name}/*.h
%doc --parents html
%changelog
Modified: tomcat/native/trunk/native/config.layout
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/config.layout?rev=1850972&r1=1850971&r2=1850972&view=diff
==============================================================================
--- tomcat/native/trunk/native/config.layout (original)
+++ tomcat/native/trunk/native/config.layout Thu Jan 10 18:24:23 2019
@@ -37,7 +37,7 @@
sysconfdir: ${prefix}/conf
datadir: ${prefix}
installbuilddir: ${datadir}/build
- includedir: ${prefix}/include/apr-${TCNATIVE_MAJOR_VERSION}
+ includedir: ${prefix}/include/tomcat-native-${TCNATIVE_MAJOR_VERSION}
localstatedir: ${prefix}
libsuffix: -${TCNATIVE_MAJOR_VERSION}
</Layout>
@@ -54,7 +54,7 @@
sysconfdir: ${prefix}/conf
datadir: ${prefix}
installbuilddir: ${datadir}/build
- includedir: ${prefix}/include/apr-${TCNATIVE_MAJOR_VERSION}
+ includedir: ${prefix}/include
localstatedir: ${prefix}
libsuffix: -${TCNATIVE_MAJOR_VERSION}
</Layout>
@@ -139,7 +139,7 @@
sysconfdir: /etc/httpd/conf
datadir: /var/www
installbuilddir: ${datadir}/build
- includedir: ${prefix}/include/apr
+ includedir: ${prefix}/include/tomcat-native
localstatedir: /var
runtimedir: ${localstatedir}/run
</Layout>
@@ -190,7 +190,7 @@
sysconfdir: /etc/httpd
datadir: /usr/local/httpd
installbuilddir: ${datadir}/build
- includedir: ${prefix}/include/apr
+ includedir: ${prefix}/include/tomcat-native
localstatedir: /var/lib/httpd
runtimedir: /var/run
</Layout>
@@ -207,7 +207,7 @@
sysconfdir: ${prefix}/conf
datadir: ${prefix}
installbuilddir: ${datadir}/build
- includedir: ${exec_prefix}/include/apr
+ includedir: ${exec_prefix}/include/tomcat-native
localstatedir: /var
runtimedir: ${localstatedir}/run
</Layout>
@@ -241,7 +241,7 @@
sysconfdir: ${prefix}/conf
datadir: ${prefix}
installbuilddir: ${prefix}/build
- includedir: ${exec_prefix}/lib/apr/include
+ includedir: ${exec_prefix}/lib/tomcat-native/include
localstatedir: ${prefix}
runtimedir: ${prefix}/logs
</Layout>
@@ -256,7 +256,7 @@
libexecdir: ${exec_prefix}/lib/apr/modules
mandir: ${exec_prefix}/share/man
datadir: ${exec_prefix}/share/apr
- includedir: ${exec_prefix}/include/apr-${TCNATIVE_MAJOR_VERSION}
+ includedir:
${exec_prefix}/include/tomcat-native-${TCNATIVE_MAJOR_VERSION}
localstatedir: ${prefix}/var/run
runtimedir: ${prefix}/var/run
infodir: ${exec_prefix}/share/info
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1850972&r1=1850971&r2=1850972&view=diff
==============================================================================
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Thu Jan 10 18:24:23
2019
@@ -35,6 +35,11 @@
</p>
</section>
<section name="Changes in 1.2.20">
+ <changelog>
+ <fix>
+ Update includedir name to tomcat-native instead of apr. (csutherl)
+ </fix>
+ </changelog>
</section>
<section name="Changes in 1.2.19">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
