--- Begin Message ---
- From: Steven Drake <sbd at NetBSD dot org>
- To: gcc-patches at gcc dot gnu dot org
- Date: Mon, 7 May 2012 13:21:49 +1200 (NZST)
- Subject: Fix the java-home OS include directory.
- Authentication-results: zmta03.collab.prod.int.phx2.redhat.com (amavisd-new);dkim=softfail (fail, message has been altered) header.i=@gcc.gnu.org
- Authentication-results: zmta03.collab.prod.int.phx2.redhat.com (amavisd-new);domainkeys=softfail (fail, message has been altered)header.sender=gcc-patches-owner@gcc.gnu.org
- Comment: DKIM? See http://www.dkim.org
- Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys
- Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed;d=gcc.gnu.org; s=default; x=1336958532; h=Comment:DomainKey-Signature:Received:Received:Received:Received:Date:From:To:Subject:Message-ID:User-Agent:MIME-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=2VXTWRaaCWZlZvtoMbmlQwaBgtY=; b=BYBiYyTjAjjGY6k6JP/Mg74bFMa0lzOwUQja5e60xI4Nwkeeg+aP8J2VYiR5q8N9iM0nrbA1h1jNdqx2+15nDTZSnKP92k1D13T7X0lofxctciQtQHdT0fzYwtI2Ha+oQCSFZ/MFD4hsh8ic8Hhdp77100aRWZdSDWEA2wTFyHc=
- Domainkey-signature: a=rsa-sha1; q=dns; c=nofws;s=default; d=gcc.gnu.org;h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Date:From:To:Subject:Message-ID:User-Agent:MIME-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To;b=w1mlu29QKNVr1CdofgiheoGB67me4O6tQyH6jfGoKasmJCQhlYqVuu3xwc86bgbnAPVGFTb1DhWDYpFGKxKMdZ+kyem1kn6iPjzjblpr/yFd2BkLeleN9IQWxospvEtc6wSBHj5MbU8awSU7uuG1YT7oY33Eo9FwkEXIM8gnuyw=;
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.
--
Steven
2012-05-07 Steven Drake <sbd@NetBSD.org>
libjava:
* Makefile.am (install-data-local): Use the $(OS) variable for the
java-home os directory under include.
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));
--- End Message ---