This is the mail archive of the mailing list for the GCC project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Fix the java-home OS include directory.

If the libjava configure option --enable-java-home is used the os directory
under include will always be 'linux' as it is hardcoded so.

I.E. it is not configurable using '--with-os-directory' or auto-detected as
suggested by the configure help text.


2012-05-07	Steven Drake <>

	* (install-data-local): Use the $(OS) variable for the
	java-home os directory under include.

diff --git a/libjava/ b/libjava/
index 1b71962..b40fa76 100644
--- a/libjava/
+++ b/libjava/
@@ -899,7 +899,7 @@ if CREATE_JAVA_HOME
 	cd $(DESTDIR)$(JRE_LIB_DIR)/security; \
 	  ln -sf $$RELATIVE/; \
 	cd $$working_dir; \
-	$(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/linux; \
+	$(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS); \
 	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \
 	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \
 	$(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \
@@ -935,9 +935,9 @@ if CREATE_JAVA_HOME
 	  DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 	    -print-file-name=include/$$headername.h)); \
 	  RELATIVE=$$(relative $$DIRECTORY \
-	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
+	    $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)); \
 	  ln -sf $$RELATIVE/$$headername.h \
-	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
+	    $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)/$$headername.h; \
 	done; \
 	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]