$NetBSD: patch-ab,v 1.1 2006/04/15 22:09:56 tonio Exp $ --- lib/Makefile.in.orig 2005-12-07 18:56:47.000000000 +0100 +++ lib/Makefile.in @@ -488,10 +488,12 @@ uninstall-am: uninstall-info-am uninstal sinclude $(JAVA_DEPEND) @INSTALL_COMPRESSED_CLASS_FILES_TRUE@install-data-hook: -@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ mkdir -p $(JAVA_HOME)/{lib,jre/lib} +@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ mkdir -p $(JAVA_HOME)/lib +@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ mkdir -p $(JAVA_HOME)/jre/lib @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ -unlink $(JAVA_HOME)/jre/lib/rt.jar @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ for f in $(pkgdata_DATA) ; do \ -@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ rm -f $(JAVA_HOME)/{lib,jre/lib}/$$f ; \ +@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ rm -f $(JAVA_HOME)/lib/$$f ; \ +@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ rm -f $(JAVA_HOME)/jre/lib/$$f ; \ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ $(LN_S) $(pkgdatadir)/$$f $(JAVA_HOME)/lib/$$f ; \ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ $(LN_S) ../../lib/$$f $(JAVA_HOME)/jre/lib/$$f ; \ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ done @@ -499,7 +501,8 @@ sinclude $(JAVA_DEPEND) @INSTALL_COMPRESSED_CLASS_FILES_TRUE@uninstall-hook: @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ for f in $(pkgdata_DATA) ; do \ -@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ rm -f $(JAVA_HOME)/{lib,jre/lib}/$$f ; \ +@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ rm -f $(JAVA_HOME)/lib/$$f ; \ +@INSTALL_COMPRESSED_CLASS_FILES_TRUE@ rm -f $(JAVA_HOME)/jre/lib/$$f ; \ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ done @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ -unlink $(JAVA_HOME)/jre/lib/rt.jar @INSTALL_COMPRESSED_CLASS_FILES_TRUE@ -(cd $(JAVA_HOME) && rmdir -p lib jre/lib)