diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-05-18 09:32:01 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-05-18 09:32:01 +0000 |
| commit | e92c2d7d19b5ee1c48c9b60c5b6ee36483ed5b92 (patch) | |
| tree | 2f827783a979029120fe98a5b947fa6b50a5ca81 /java/sablevm-classpath/files | |
| parent | - Add conflict with smstools-3.* (diff) | |
- Fix build/install problems
PR: 120959
Reported by: Andrew Reilly <areilly@bigpond.net.au>
Submitted by: Bjoern Koenig <bkoenig@alpha-tierchen.de> (maintainer)
Notes
Notes:
svn path=/head/; revision=213260
Diffstat (limited to 'java/sablevm-classpath/files')
| -rw-r--r-- | java/sablevm-classpath/files/patch-lib-Makefile | 24 |
1 files changed, 24 insertions, 0 deletions
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) |