[kaffe] CVS kaffe (robilad): Small fix to link rt.jar as glibj.zip for tools expecting to see an rt.jar file

[Kaffe CVS]

PatchSet 6995 
Date: 2005/12/10 23:17:52
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Small fix to link rt.jar as glibj.zip for tools expecting to see an rt.jar file

2005-12-11  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/Makefile.am.in:
        (install-hook) Renamed to
        (install-data-local), so that it gets picked up by automake.
        Added a dependency on installdirs to make sure its ran after the
        directories are created.
        (uninstall-local) Added.

        Reported by:  Alejandro Mery  <amery at geeks.cl>

Members: 
	ChangeLog:1.4516->1.4517 
	libraries/javalib/Makefile.am:1.408->1.409 
	libraries/javalib/Makefile.am.in:1.55->1.56 
	libraries/javalib/Makefile.in:1.504->1.505 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4516 kaffe/ChangeLog:1.4517
--- kaffe/ChangeLog:1.4516	Sat Dec 10 19:55:32 2005
+++ kaffe/ChangeLog	Sat Dec 10 23:17:52 2005
@@ -1,3 +1,14 @@
+2005-12-11  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/javalib/Makefile.am.in:
+	(install-hook) Renamed to 
+	(install-data-local), so that it gets picked up by automake.
+	Added a dependency on installdirs to make sure its ran after the 
+	directories are created.
+	(uninstall-local) Added.
+
+        Reported by:  Alejandro Mery  <amery at geeks.cl>
+
 2005-12-10  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/clib/native/java_lang_VMProcess.c
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.408 kaffe/libraries/javalib/Makefile.am:1.409
--- kaffe/libraries/javalib/Makefile.am:1.408	Thu Dec  8 21:29:07 2005
+++ kaffe/libraries/javalib/Makefile.am	Sat Dec 10 23:17:53 2005
@@ -42,8 +42,11 @@
 
 export JAVA_COMPILER
 
-install-hook:
+install-data-local: installdirs
 	$(LN_S) ${jrelibdir}/glibj.zip ${jrelibdir}/rt.jar
+
+uninstall-local: 
+	$(RM) ${jrelibdir}/rt.jar
 
 EXTRA_DIST= \
 	    Makefile.am.in \
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.55 kaffe/libraries/javalib/Makefile.am.in:1.56
--- kaffe/libraries/javalib/Makefile.am.in:1.55	Sat Dec  3 16:53:14 2005
+++ kaffe/libraries/javalib/Makefile.am.in	Sat Dec 10 23:17:54 2005
@@ -42,8 +42,11 @@
 
 export JAVA_COMPILER
 
-install-hook:
+install-data-local: installdirs
 	$(LN_S) ${jrelibdir}/glibj.zip ${jrelibdir}/rt.jar
+
+uninstall-local: 
+	$(RM) ${jrelibdir}/rt.jar
 
 EXTRA_DIST= \
 	    Makefile.am.in \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.504 kaffe/libraries/javalib/Makefile.in:1.505
--- kaffe/libraries/javalib/Makefile.in:1.504	Thu Dec  8 21:29:08 2005
+++ kaffe/libraries/javalib/Makefile.in	Sat Dec 10 23:17:54 2005
@@ -1990,7 +1990,7 @@
 
 info-am:
 
-install-data-am: install-jrelibDATA
+install-data-am: install-data-local install-jrelibDATA
 
 install-exec-am:
 
@@ -2016,7 +2016,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-jrelibDATA
+uninstall-am: uninstall-info-am uninstall-jrelibDATA uninstall-local
 
 uninstall-info: uninstall-info-recursive
 
@@ -2025,14 +2025,15 @@
 	ctags-recursive distclean distclean-generic distclean-libtool \
 	distclean-recursive distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-jrelibDATA install-man install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-jrelibDATA
+	install-data-am install-data-local install-exec \
+	install-exec-am install-info install-info-am \
+	install-jrelibDATA install-man install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am uninstall-jrelibDATA \
+	uninstall-local
 
 
 @USE_PRECOMPILED_RT_JAR_TRUE at stamp-glibj:
@@ -2047,8 +2048,11 @@
 
 export JAVA_COMPILER
 
-install-hook:
+install-data-local: installdirs
 	$(LN_S) ${jrelibdir}/glibj.zip ${jrelibdir}/rt.jar
+
+uninstall-local: 
+	$(RM) ${jrelibdir}/rt.jar
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: