- %_tomcatconfdir

- 1.540

Changed files:
    rpm-build-macros.spec -> 1.238
    rpm.macros -> 1.540

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 17806c76a41b5850a274a1a5cbff2b54e869c130..0866df7c5c8e1adab168646f5e67cc77bad49fa4 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.539
+%define                rpm_macros_rev  1.540
 %define                find_lang_rev   1.32
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index ad52bae9cc9832fd548285537529d6af35aa0dbf..7a45bb1f3c58c3b3884518f43ea377de3455b806 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1276,6 +1276,10 @@ cat %{_mavendepmapfragdir}/* >> %{_mavendepmapdir}/maven2-depmap.xml\
 fi\
 echo -e "</dependencies>\\n" >> %{_mavendepmapdir}/maven2-depmap.xml
 
+# JAVA macros specific for PLD
+
+# Directory for tomcat context configuration files
+%_tomcatconfdir        %{_sharedstatedir}/tomcat/conf/Catalina/localhost
 
 # PEAR install macros
 # Author: Elan Ruusamäe <glen@pld-linux.org>