make/common/Modules.gmk

*** 205,215 ****
  define copy-module-content
  image=$(strip $1); m=$(strip $2); \
  javahome=$(MODULE_IMAGES_DIR)/$$image; \
  for d in bin lib ; do \
     if [ -d $$m/$$d ] ; then \
!        $(CP) -rf $(ABS_MODULES_DIR)/$$m/$$d $$javahome; \
     fi ; \
  done 
  endef
  
  #
--- 205,215 ----
  define copy-module-content
  image=$(strip $1); m=$(strip $2); \
  javahome=$(MODULE_IMAGES_DIR)/$$image; \
  for d in bin lib ; do \
     if [ -d $$m/$$d ] ; then \
!        $(CP) -rf $(ABS_MODULEPATH_DIR)/$$m/$$d $$javahome; \
     fi ; \
  done 
  endef
  
  #
*** 226,237 ****
  #
  define copy-jre-image
  from=$(strip $1); dest=$(strip $2); \
  ($(CD) $(MODULE_IMAGES_DIR)/$$from && $(FIND) . -depth -print \
                | $(CPIO) -pdum $(MODULE_IMAGES_DIR)/$$dest) ; \
! if [ -d "$(ABS_MODULES_DIR)/jdk.boot/include" ] ; then \
!    $(CP) -rf $(ABS_MODULES_DIR)/jdk.boot/include $(MODULE_IMAGES_DIR)/$$dest; \
  fi
  endef
  
  #
  # Install jigsaw module 
--- 226,237 ----
  #
  define copy-jre-image
  from=$(strip $1); dest=$(strip $2); \
  ($(CD) $(MODULE_IMAGES_DIR)/$$from && $(FIND) . -depth -print \
                | $(CPIO) -pdum $(MODULE_IMAGES_DIR)/$$dest) ; \
! if [ -d "$(ABS_MODULEPATH_DIR)/jdk.boot/include" ] ; then \
!    $(CP) -rf $(ABS_MODULEPATH_DIR)/jdk.boot/include $(MODULE_IMAGES_DIR)/$$dest; \
  fi
  endef
  
  #
  # Install jigsaw module 
*** 241,251 ****
  image=$(strip $1); m=$(strip $2); \
  mlib=$(MODULE_IMAGES_DIR)/$$image/lib/modules; \
  mid=`$(HOST_JMOD_CMD) ls -L $$mlib $$m | $(GREP) -v '#'` ; \
  if [ "x$$mid" = "x" ] ; then \
     $(ECHO) "Installing module $$m in $$image" ; \
!    $(CD) $(ABS_MODULES_DIR) && \
     if [ -d $$m/resources ] ; then \
        $(HOST_JMOD_CMD) install $$m/classes -r $$m/resources -L $$mlib $$m || exit 1; \
     else \
        $(HOST_JMOD_CMD) install $$m/classes -L $$mlib $$m || exit 1; \
     fi ; \
--- 241,251 ----
  image=$(strip $1); m=$(strip $2); \
  mlib=$(MODULE_IMAGES_DIR)/$$image/lib/modules; \
  mid=`$(HOST_JMOD_CMD) ls -L $$mlib $$m | $(GREP) -v '#'` ; \
  if [ "x$$mid" = "x" ] ; then \
     $(ECHO) "Installing module $$m in $$image" ; \
!    $(CD) $(ABS_MODULEPATH_DIR) && \
     if [ -d $$m/resources ] ; then \
        $(HOST_JMOD_CMD) install $$m/classes -r $$m/resources -L $$mlib $$m || exit 1; \
     else \
        $(HOST_JMOD_CMD) install $$m/classes -L $$mlib $$m || exit 1; \
     fi ; \
*** 255,265 ****
  fi
  endef
  
  
  # Rules for building packages
! include $(BUILDDIR)/common/BuildPackages.gmk
  
  PKG_TYPES = jmod-pkgs
  DEBIAN := $(shell \
                 if [ -f /etc/debian_version ] ; then \
                    $(ECHO) true; \
--- 255,265 ----
  fi
  endef
  
  
  # Rules for building packages
! include $(BUILDDIR)/common/BuildNativePackages.gmk
  
  PKG_TYPES = jmod-pkgs
  DEBIAN := $(shell \
                 if [ -f /etc/debian_version ] ; then \
                    $(ECHO) true; \