freebsd-ports/java/sablevm-classpath/files/patch-lib-Makefile
Martin Wilke e92c2d7d19 - Fix build/install problems
PR:		120959
Reported by:	Andrew Reilly <areilly@bigpond.net.au>
Submitted by:	Bjoern Koenig <bkoenig@alpha-tierchen.de> (maintainer)
2008-05-18 09:32:01 +00:00

24 lines
1.4 KiB
Text

--- lib/Makefile.in.orig 2007-03-30 06:29:03.000000000 +0000
+++ lib/Makefile.in 2008-02-22 18:45:25.000000000 +0000
@@ -494,10 +494,10 @@
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 $(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 $(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
@@ -505,7 +505,7 @@
@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 $(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)