Patchwork Fix the java-home OS include directory.

login
register
mail settings
Submitter Steven Drake
Date May 7, 2012, 1:21 a.m.
Message ID <alpine.LNX.2.00.1205071320060.19976@nygne.qenxr.bet.am>
Download mbox | patch
Permalink /patch/157205/
State New
Headers show

Comments

Steven Drake - May 7, 2012, 1:21 a.m.
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.

Patch

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 1b71962..b40fa76 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -899,7 +899,7 @@  if CREATE_JAVA_HOME
 	cd $(DESTDIR)$(JRE_LIB_DIR)/security; \
 	  ln -sf $$RELATIVE/classpath.security java.security; \
 	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 \
 	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR));