summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2010-09-10 22:21:49 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-10-27 18:23:03 +0200
commit7fdfb6d10d33d16c3f163c7ac2c8f629f097965c (patch)
tree9c5dcc25d64b78dc147bff647c5467284bdb835a
parent27afe02cd9bc89dfff830a183a72be96479ee23d (diff)
downloadptxdist-7fdfb6d10d33d16c3f163c7ac2c8f629f097965c.tar.gz
ptxdist-7fdfb6d10d33d16c3f163c7ac2c8f629f097965c.tar.xz
[classpath] targetinstall consolidation
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/classpath.make34
1 files changed, 7 insertions, 27 deletions
diff --git a/rules/classpath.make b/rules/classpath.make
index 4dc3e431e..f51644188 100644
--- a/rules/classpath.make
+++ b/rules/classpath.make
@@ -150,33 +150,13 @@ $(STATEDIR)/classpath.targetinstall:
@$(call install_copy, classpath, 0, 0, 0644, -, /usr/share/classpath/glibj.zip)
@$(call install_copy, classpath, 0, 0, 0644, -, /usr/share/classpath/tools.zip)
- @$(call install_copy, classpath, 0, 0, 0644, -, /usr/lib/classpath/libjavautil.so.0.0.0)
- @$(call install_link, classpath, libjavautil.so.0.0.0, /usr/lib/classpath/libjavautil.so.0)
- @$(call install_link, classpath, libjavautil.so.0.0.0, /usr/lib/classpath/libjavautil.so)
-
- @$(call install_copy, classpath, 0, 0, 0644, -, /usr/lib/classpath/libjavalangmanagement.so.0.0.0)
- @$(call install_link, classpath, libjavalangmanagement.so.0.0.0, /usr/lib/classpath/libjavalangmanagement.so.0)
- @$(call install_link, classpath, libjavalangmanagement.so.0.0.0, /usr/lib/classpath/libjavalangmanagement.so)
-
- @$(call install_copy, classpath, 0, 0, 0644, -, /usr/lib/classpath/libjavaio.so.0.0.0)
- @$(call install_link, classpath, libjavaio.so.0.0.0, /usr/lib/classpath/libjavaio.so.0)
- @$(call install_link, classpath, libjavaio.so.0.0.0, /usr/lib/classpath/libjavaio.so)
-
- @$(call install_copy, classpath, 0, 0, 0644, -, /usr/lib/classpath/libjavalang.so.0.0.0)
- @$(call install_link, classpath, libjavalang.so.0.0.0, /usr/lib/classpath/libjavalang.so.0)
- @$(call install_link, classpath, libjavalang.so.0.0.0, /usr/lib/classpath/libjavalang.so)
-
- @$(call install_copy, classpath, 0, 0, 0644, -, /usr/lib/classpath/libjavanet.so.0.0.0)
- @$(call install_link, classpath, libjavanet.so.0.0.0, /usr/lib/classpath/libjavanet.so.0)
- @$(call install_link, classpath, libjavanet.so.0.0.0, /usr/lib/classpath/libjavanet.so)
-
- @$(call install_copy, classpath, 0, 0, 0644, -, /usr/lib/classpath/libjavalangreflect.so.0.0.0)
- @$(call install_link, classpath, libjavalangreflect.so.0.0.0, /usr/lib/classpath/libjavalangreflect.so.0)
- @$(call install_link, classpath, libjavalangreflect.so.0.0.0, /usr/lib/classpath/libjavalangreflect.so)
-
- @$(call install_copy, classpath, 0, 0, 0644, -, /usr/lib/classpath/libjavanio.so.0.0.0)
- @$(call install_link, classpath, libjavanio.so.0.0.0, /usr/lib/classpath/libjavanio.so.0)
- @$(call install_link, classpath, libjavanio.so.0.0.0, /usr/lib/classpath/libjavanio.so)
+ @$(call install_lib, classpath, 0, 0, 0644, classpath/libjavautil)
+ @$(call install_lib, classpath, 0, 0, 0644, classpath/libjavalangmanagement)
+ @$(call install_lib, classpath, 0, 0, 0644, classpath/libjavaio)
+ @$(call install_lib, classpath, 0, 0, 0644, classpath/libjavalang)
+ @$(call install_lib, classpath, 0, 0, 0644, classpath/libjavanet)
+ @$(call install_lib, classpath, 0, 0, 0644, classpath/libjavalangreflect)
+ @$(call install_lib, classpath, 0, 0, 0644, classpath/libjavanio)
@$(call install_copy, classpath, 0, 0, 0644, -, /usr/lib/security/classpath.security)
@$(call install_copy, classpath, 0, 0, 0644, -, /usr/lib/logging.properties)