$OpenBSD: patch-deploy_make_common_DeployRules-solaris_gmk,v 1.3 2011/10/07 02:04:12 kurt Exp $
--- deploy/make/common/DeployRules-solaris.gmk.orig	Thu Sep 29 13:19:57 2011
+++ deploy/make/common/DeployRules-solaris.gmk	Thu Sep 29 22:36:13 2011
@@ -34,9 +34,9 @@ ifeq ($(PLATFORM), solaris)
 
     LDFLAGS = -xnolib -norunpath -lCrun -lnsl -ldl -lc
 else
-    CC   = $(COMPILER_PATH)gcc
-    CXX  = $(COMPILER_PATH)g++
-    LINK = $(COMPILER_PATH)g++
+    CC   ?= $(COMPILER_PATH)gcc
+    CXX  ?= $(COMPILER_PATH)g++
+    LINK = $(CXX)
 
     ifeq ($(OS_VENDOR),Apple)
       # Option used to create a shared library
@@ -61,8 +61,8 @@ $(DEPLOY_COMMON_LIB): $(SO_o)
 
 $(DEPLOYOBJDIR)/%.o: %.c
 	@$(prep-target)
-	$(CC) -I$(BOOTDIR)/include                         \
-	      -I$(BOOTDIR)/include/$(PLATFORM_JNI_INCLUDE) \
+	$(CC) -I$(JAVAWS_BOOTDIR)/include                         \
+	      -I$(JAVAWS_BOOTDIR)/include/$(PLATFORM_JNI_INCLUDE) \
 	      -I$(DEPLOY_SHARE_SRC)/native                 \
 	      -I$(DEPLOY_PLATFORM_SRC)/native              \
 	      -I$(DEPLOYCLASSHDRDIR)                       \
@@ -71,8 +71,8 @@ $(DEPLOYOBJDIR)/%.o: %.c
 
 $(DEPLOYOBJDIR)/%.o: %.cpp
 	@$(prep-target)
-	$(CXX) -I$(BOOTDIR)/include                         \
-	       -I$(BOOTDIR)/include/$(PLATFORM_JNI_INCLUDE) \
+	$(CXX) -I$(JAVAWS_BOOTDIR)/include                         \
+	       -I$(JAVAWS_BOOTDIR)/include/$(PLATFORM_JNI_INCLUDE) \
 	       -I$(DEPLOY_SHARE_SRC)/native                 \
 	       -I$(DEPLOY_PLATFORM_SRC)/native              \
 	       -I$(DEPLOYCLASSHDRDIR)                       \
