diff options
| author | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-03-03 17:03:51 +0000 |
|---|---|---|
| committer | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-03-03 17:03:51 +0000 |
| commit | 2e9edbc98892d32e8b79c31607e284beb6c00636 (patch) | |
| tree | 60c3b065fa902e4b87279fbf3bfddb96226fa41a /libjava/Makefile.in | |
| parent | 072866b64ffbe16bc34d0294c4b8bc9b4ec37ac3 (diff) | |
| download | ppe42-gcc-2e9edbc98892d32e8b79c31607e284beb6c00636.tar.gz ppe42-gcc-2e9edbc98892d32e8b79c31607e284beb6c00636.zip | |
Cleanup new JDK directory support in GCJ.
2009-03-03 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Remove dangling src.zip and javac symlinks.
Fix java.security symlink to use toolexeclibdir
as classpath/resource/Makefile.am does.
* Makefile.in,
* configure: Regenerated.
* configure.ac: Drop hard-coded prefix,
thus removing sdk_dir and making jre_dir="jre".
Map x86_64 to amd64 as used by OpenJDK.
* gcj/Makefile.in,
* include/Makefile.in,
* testsuite/Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@144576 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.in')
| -rw-r--r-- | libjava/Makefile.in | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libjava/Makefile.in b/libjava/Makefile.in index c7b22721c7f..4de0b3142c0 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -743,7 +743,6 @@ PKG_CONFIG = @PKG_CONFIG@ PLATFORM = @PLATFORM@ RANLIB = @RANLIB@ SDK_BIN_DIR = @SDK_BIN_DIR@ -SDK_DIR = @SDK_DIR@ SDK_INCLUDE_DIR = @SDK_INCLUDE_DIR@ SDK_LIB_DIR = @SDK_LIB_DIR@ SDK_LNK = @SDK_LNK@ @@ -12434,7 +12433,6 @@ install-data-local: @CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(SDK_BIN_DIR)/rmic; \ @CREATE_JAVA_HOME_TRUE@ ln -sf $$RELATIVE/`echo gjavah | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ @CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(SDK_BIN_DIR)/javah; \ -@CREATE_JAVA_HOME_TRUE@ ln -sf $$RELATIVE/ecj $(DESTDIR)$(SDK_BIN_DIR)/javac; \ @CREATE_JAVA_HOME_TRUE@ ln -sf $$RELATIVE/`echo gappletviewer | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ @CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(SDK_BIN_DIR)/appletviewer; \ @CREATE_JAVA_HOME_TRUE@ ln -sf $$RELATIVE/`echo gjarsigner | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ @@ -12486,7 +12484,7 @@ install-data-local: @CREATE_JAVA_HOME_TRUE@ done; \ @CREATE_JAVA_HOME_TRUE@ cd $$working_dir; \ @CREATE_JAVA_HOME_TRUE@ $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/security; \ -@CREATE_JAVA_HOME_TRUE@ RELATIVE=$$(relative $(DESTDIR)$(libdir)/security \ +@CREATE_JAVA_HOME_TRUE@ RELATIVE=$$(relative $(DESTDIR)$(toolexeclibdir)/security \ @CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(JRE_LIB_DIR)/security); \ @CREATE_JAVA_HOME_TRUE@ cd $(DESTDIR)$(JRE_LIB_DIR)/security; \ @CREATE_JAVA_HOME_TRUE@ ln -sf $$RELATIVE/classpath.security java.security; \ @@ -12532,9 +12530,7 @@ install-data-local: @CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \ @CREATE_JAVA_HOME_TRUE@ done; \ @CREATE_JAVA_HOME_TRUE@ RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \ -@CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \ -@CREATE_JAVA_HOME_TRUE@ ln -sf $$RELATIVE/src-$(gcc_version).zip \ -@CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip; +@CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); maintainer-check: libgcj.la $(NM) .libs/libgcj.a | grep ' T ' \ |
