PatchSet 7079
Date: 2006/01/07 05:33:00
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Consider DESTDIR when linking rt.jar to glibj.zip
2006-01-07 Wolfgang Baer <[EMAIL PROTECTED]>
* libraries/javalib/Makefile.am.in (install-data-local,
uninstall-local):
Use DESTDIR when linking rt.jat to glibj.zip.
Members:
ChangeLog:1.4598->1.4599
libraries/javalib/Makefile.am:1.419->1.420
libraries/javalib/Makefile.am.in:1.60->1.61
libraries/javalib/Makefile.in:1.518->1.519
libraries/javalib/external/classpath/config.sub:1.14->1.15
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4598 kaffe/ChangeLog:1.4599
--- kaffe/ChangeLog:1.4598 Fri Jan 6 18:58:09 2006
+++ kaffe/ChangeLog Sat Jan 7 05:33:00 2006
@@ -1,3 +1,8 @@
+2006-01-07 Wolfgang Baer <[EMAIL PROTECTED]>
+
+ * libraries/javalib/Makefile.am.in (install-data-local,
uninstall-local):
+ Use DESTDIR when linking rt.jat to glibj.zip.
+
2006-01-06 Guilhem Lavaux <[EMAIL PROTECTED]>
* libraries/clib/security/Kaffe.security: Load all GNU security
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.419
kaffe/libraries/javalib/Makefile.am:1.420
--- kaffe/libraries/javalib/Makefile.am:1.419 Tue Jan 3 15:28:10 2006
+++ kaffe/libraries/javalib/Makefile.am Sat Jan 7 05:33:05 2006
@@ -46,14 +46,14 @@
export JAVA_COMPILER
install-data-local: installdirs
- if test -f ${jrelibdir}/glibj.zip ; then \
- if ! test -f ${jrelibdir}/rt.jar ; then \
- $(LN_S) ${jrelibdir}/glibj.zip ${jrelibdir}/rt.jar ; \
+ if test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \
+ if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \
+ $(LN_S) $(DESTDIR)${jrelibdir}/glibj.zip
$(DESTDIR)${jrelibdir}/rt.jar ; \
fi ; \
fi
uninstall-local:
- $(RM) ${jrelibdir}/rt.jar
+ $(RM) $(DESTDIR)${jrelibdir}/rt.jar
EXTRA_DIST= \
Makefile.am.in \
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.60
kaffe/libraries/javalib/Makefile.am.in:1.61
--- kaffe/libraries/javalib/Makefile.am.in:1.60 Fri Dec 23 18:00:48 2005
+++ kaffe/libraries/javalib/Makefile.am.in Sat Jan 7 05:33:05 2006
@@ -46,14 +46,14 @@
export JAVA_COMPILER
install-data-local: installdirs
- if test -f ${jrelibdir}/glibj.zip ; then \
- if ! test -f ${jrelibdir}/rt.jar ; then \
- $(LN_S) ${jrelibdir}/glibj.zip ${jrelibdir}/rt.jar ; \
+ if test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \
+ if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \
+ $(LN_S) $(DESTDIR)${jrelibdir}/glibj.zip
$(DESTDIR)${jrelibdir}/rt.jar ; \
fi ; \
fi
uninstall-local:
- $(RM) ${jrelibdir}/rt.jar
+ $(RM) $(DESTDIR)${jrelibdir}/rt.jar
EXTRA_DIST= \
Makefile.am.in \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.518
kaffe/libraries/javalib/Makefile.in:1.519
--- kaffe/libraries/javalib/Makefile.in:1.518 Tue Jan 3 15:28:12 2006
+++ kaffe/libraries/javalib/Makefile.in Sat Jan 7 05:33:05 2006
@@ -1854,14 +1854,14 @@
export JAVA_COMPILER
install-data-local: installdirs
- if test -f ${jrelibdir}/glibj.zip ; then \
- if ! test -f ${jrelibdir}/rt.jar ; then \
- $(LN_S) ${jrelibdir}/glibj.zip ${jrelibdir}/rt.jar ; \
+ if test -f $(DESTDIR)${jrelibdir}/glibj.zip ; then \
+ if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \
+ $(LN_S) $(DESTDIR)${jrelibdir}/glibj.zip
$(DESTDIR)${jrelibdir}/rt.jar ; \
fi ; \
fi
uninstall-local:
- $(RM) ${jrelibdir}/rt.jar
+ $(RM) $(DESTDIR)${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:
Index: kaffe/libraries/javalib/external/classpath/config.sub
diff -u kaffe/libraries/javalib/external/classpath/config.sub:1.14
kaffe/libraries/javalib/external/classpath/config.sub:1.15
--- kaffe/libraries/javalib/external/classpath/config.sub:1.14 Fri Jan 6
03:49:01 2006
+++ kaffe/libraries/javalib/external/classpath/config.sub Sat Jan 7
05:33:07 2006
@@ -1335,6 +1335,9 @@
-kaos*)
os=-kaos
;;
+ -*drops)
+ os=-drops
+ ;;
-zvmoe)
os=-zvmoe
;;
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
