makefiles/Import.gmk

*** 155,164 ****
--- 155,166 ----
              IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
          endif
      endif
  endif
  
+ # Fixme: this should be based on the contents of JVM_VARIANTS not hardwired for client/server/minimal
+ 
  $(INSTALL_LIBRARIES_HERE)/server/%$(SHARED_LIBRARY_SUFFIX) : $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
          $(MKDIR) -p $(@D)
          $(RM) $@
          $(LN) -s ../$(@F) $@
  
*** 207,216 ****
--- 209,240 ----
          $(ZIP) -q -y $@.tmp $(basename $@).debuginfo
          $(RM) $(basename $@).debuginfo
          $(MV) $@.tmp $@
  endif
  
+ $(INSTALL_LIBRARIES_HERE)/minimal/%$(SHARED_LIBRARY_SUFFIX) : $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
+         $(RM) -f $@
+         $(LN) -s ../$(@F) $@
+ 
+ $(INSTALL_LIBRARIES_HERE)/minimal/%.debuginfo : $(INSTALL_LIBRARIES_HERE)/%.debuginfo
+         $(RM) -f $@
+         $(LN) -s ../$(@F) $@
+ 
+ $(INSTALL_LIBRARIES_HERE)/minimal/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
+         $(RM) -f $@
+ ifeq (REALLY_WEIRD,1)
+         $(LN) -s ../$(@F) $@
+ else
+ #
+ # TODO: Check if this is what they really want...a zip containing a symlink
+ #
+         $(RM) -f $(basename $@).debuginfo
+         $(LN) -s ../$(basename $(@F)).debuginfo $(basename $@).debuginfo
+         $(ZIP) -q -y $@ $(basename $@).debuginfo
+         $(RM) -f $(basename $@).debuginfo
+ endif
+ 
  #######
  
  ifeq ($(OPENJDK_TARGET_OS),solaris)
  define install-file
          $(MKDIR) -p '$(@D)'