commit e6bc9990787a0224c74d2d66e37d79fadc37ee31
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Feb 3 13:12:53 2014 +0100
Install rpm macros into proper place
For rpm 4.11+ preferred directory for macros is /usr/lib/rpm/macros.d so let's
install macros there. Also have them in a separate macros.d directory in git
build | 6 +++---
configure | 2 +-
install | 6 +++---
{etc => macros.d}/macros.fjava | 0
{etc => macros.d}/macros.jpackage | 0
{etc => macros.d}/macros.xmvn | 0
6 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/build b/build
index 8a23526..b3aacdf 100755
--- a/build
+++ b/build
@@ -81,9 +81,9 @@ expand bin/rebuild-jar-repository
expand bin/shade-jar
expand bin/xmvn-builddep
expand etc/java.conf
-expand etc/macros.jpackage
-expand etc/macros.fjava
-expand etc/macros.xmvn
+expand macros.d/macros.jpackage
+expand macros.d/macros.fjava
+expand macros.d/macros.xmvn
expand java-utils/java-functions
manpage abs2rel
diff --git a/configure b/configure
index 3288fda..6ee66d8 100755
--- a/configure
+++ b/configure
@@ -74,6 +74,6 @@ test -z "${rpmconfigdir}" &&
rpmconfigdir="${prefix}/lib/rpm"
test -z "${m2home}" && m2home="${datadir}/xmvn"
-eval $(sed -n 's/^%_\('"$vars_re"'\)\
*\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' etc/macros.jpackage)
+eval $(sed -n 's/^%_\('"$vars_re"'\)\
*\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.jpackage)
set | sed -n 's/^\('"$vars_re"'\)=/&/;T;p'
>config.status
diff --git a/install b/install
index 71a80f7..a88c533 100755
--- a/install
+++ b/install
@@ -122,8 +122,8 @@ inst_data target/java-functions "${javadir}-utils"
inst_data java-utils/maven_depmap.py "${javadir}-utils"
inst_data java-utils/pom_editor.py "${javadir}-utils"
-inst_data target/macros.jpackage "${sysconfdir}/rpm"
-inst_data target/macros.fjava "${sysconfdir}/rpm"
+inst_data target/macros.jpackage "${rpmconfigdir}/macros.d"
+inst_data target/macros.fjava "${rpmconfigdir}/macros.d"
inst_data target/build-classpath.1 "${mandir}/man1"
inst_data target/build-jar-repository.1 "${mandir}/man1"
@@ -162,7 +162,7 @@ exec >files-maven
dir "${m2home}"
-inst_data target/macros.xmvn "${sysconfdir}/rpm"
+inst_data target/macros.xmvn "${rpmconfigdir}/macros.d"
inst_data java-utils/builddep.py "${javadir}-utils"
inst_data java-utils/mvn_alias.py "${javadir}-utils"
diff --git a/etc/macros.fjava b/macros.d/macros.fjava
similarity index 100%
rename from etc/macros.fjava
rename to macros.d/macros.fjava
diff --git a/etc/macros.jpackage b/macros.d/macros.jpackage
similarity index 100%
rename from etc/macros.jpackage
rename to macros.d/macros.jpackage
diff --git a/etc/macros.xmvn b/macros.d/macros.xmvn
similarity index 100%
rename from etc/macros.xmvn
rename to macros.d/macros.xmvn
Show replies by date