*** old/make/bsd/makefiles/defs.make	Fri Sep 21 10:48:13 2012
--- new/make/bsd/makefiles/defs.make	Fri Sep 21 10:48:13 2012

*** 153,162 ****
--- 153,163 ----
  
  # client and server subdirectories have symbolic links to ../libjsig.so
  EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
  EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
  EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
+ EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
  
  EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
  
  ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
    EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt

*** 166,175 ****
--- 167,189 ----
  ifeq ($(JVM_VARIANT_CLIENT),true)
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
  endif
  
+ ifeq ($(JVM_VARIANT_MINIMAL1),true)
+   EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/Xusage.txt
+   EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.$(LIBRARY_SUFFIX)
+ 
+   ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+     ifeq ($(ZIP_DEBUGINFO_FILES),1)
+         EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.diz
+     else
+         EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo
+     endif
+   endif 
+ endif
+ 
  # Serviceability Binaries
  # No SA Support for PPC, IA64, ARM or zero
  ADD_SA_BINARIES/x86   = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
                          $(EXPORT_LIB_DIR)/sa-jdi.jar
  ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \