Hi,

Linking rt.jar to glibj.zip doesn't respect DESTDIR thus breaking the
debian package build.

Attached patch should fix it - please apply (if correct :-) )

Regards,
Wolfgang

--- kaffe-1.1.6.cvs20060105/libraries/javalib/Makefile.in.orig	2006-01-03 16:28:12.000000000 +0100
+++ kaffe-1.1.6.cvs20060105/libraries/javalib/Makefile.in	2006-01-06 13:57:37.000000000 +0100
@@ -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:
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

Reply via email to