From e92c2d7d19b5ee1c48c9b60c5b6ee36483ed5b92 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sun, 18 May 2008 09:32:01 +0000 Subject: - Fix build/install problems PR: 120959 Reported by: Andrew Reilly Submitted by: Bjoern Koenig (maintainer) --- java/sablevm-classpath/files/patch-lib-Makefile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 java/sablevm-classpath/files/patch-lib-Makefile (limited to 'java/sablevm-classpath/files') diff --git a/java/sablevm-classpath/files/patch-lib-Makefile b/java/sablevm-classpath/files/patch-lib-Makefile new file mode 100644 index 000000000000..dc62f973f35b --- /dev/null +++ b/java/sablevm-classpath/files/patch-lib-Makefile @@ -0,0 +1,24 @@ +--- 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) -- cgit v1.2.3