82ac160
From 3b075d731be2348dd62e70835ae01a0cc760cdda Mon Sep 17 00:00:00 2001
82ac160
From: Michal Srb <msrb@redhat.com>
82ac160
Date: Tue, 8 Dec 2015 10:48:52 +0100
82ac160
Subject: [PATCH 2/2] [install] Move mvn_build and builddep from maven-local to
82ac160
 javapackages-local
82ac160
82ac160
---
82ac160
 install | 8 +++-----
82ac160
 1 file changed, 3 insertions(+), 5 deletions(-)
82ac160
82ac160
diff --git a/install b/install
82ac160
index 3a3bcf4..ade6b97 100755
82ac160
--- a/install
82ac160
+++ b/install
82ac160
@@ -171,8 +171,10 @@ link "${m2home}/configuration.xml" "${m2home}/configuration-21.xml"
82ac160
 inst_config etc/javapackages-config.json "${javaconfdir}"
82ac160
 
82ac160
 exec >files-local
82ac160
+inst_data java-utils/builddep.py "${javadir}-utils"
82ac160
 inst_data java-utils/mvn_alias.py "${javadir}-utils"
82ac160
 inst_data java-utils/mvn_artifact.py "${javadir}-utils"
82ac160
+inst_data java-utils/mvn_build.py "${javadir}-utils"
82ac160
 inst_data java-utils/mvn_compat_version.py "${javadir}-utils"
82ac160
 inst_data java-utils/mvn_config.py "${javadir}-utils"
82ac160
 inst_data java-utils/mvn_file.py "${javadir}-utils"
82ac160
@@ -180,6 +182,7 @@ inst_data java-utils/mvn_package.py "${javadir}-utils"
82ac160
 
82ac160
 inst_data target/mvn_alias.7 "${mandir}/man7"
82ac160
 inst_data target/mvn_artifact.7 "${mandir}/man7"
82ac160
+inst_data target/mvn_build.7 "${mandir}/man7"
82ac160
 inst_data target/mvn_compat_version.7 "${mandir}/man7"
82ac160
 inst_data target/mvn_config.7 "${mandir}/man7"
82ac160
 inst_data target/mvn_file.7 "${mandir}/man7"
82ac160
@@ -193,11 +196,6 @@ dir "${m2home}"
82ac160
 inst_data metadata/metadata-org-apache-maven-plugins.xml "${sysconfdir}/maven"
82ac160
 inst_data metadata/metadata-org-codehaus-mojo.xml "${sysconfdir}/maven"
82ac160
 
82ac160
-inst_data java-utils/builddep.py "${javadir}-utils"
82ac160
-inst_data java-utils/mvn_build.py "${javadir}-utils"
82ac160
-
82ac160
-inst_data target/mvn_build.7 "${mandir}/man7"
82ac160
-
82ac160
 
82ac160
 exec >files-ivy
82ac160
 
82ac160
-- 
82ac160
2.5.0
82ac160