@@ -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));