cleanup xdccore import of xdc.tools.sg
diff --git a/src/bundles/xdccore/custom.mak b/src/bundles/xdccore/custom.mak
index 04d588a..84a30d7 100644
--- a/src/bundles/xdccore/custom.mak
+++ b/src/bundles/xdccore/custom.mak
@@ -1,4 +1,6 @@
 EXPORT_DIR   = ../../../exports
+IMPORT_DIR   = ../../../imports
+
 PACKAGE_NAME = xdccore
 EXPORTS      = xdccore-Windows.zip xdccore-Linux.zip xdccore-Linux_arm.zip xdccore-MacOS.zip \
 	       xdchost-Windows.zip xdchost-Linux.zip xdchost-Linux_arm.zip xdchost-MacOS.zip
@@ -8,7 +10,7 @@
 JRE_Linx_arm = 
 JRE_MacOS    = $(TOOLS)/vendors/oracle/jdk/jdk1.7.0_55/MacOS/jre
 
-SWT_Linux    = $(EXPORT_DIR)/xdc_tools_sg_swt_linux.zip
+SWT_Linux    = $(IMPORT_DIR)/xdc/tools/sg/swt_linux
 SWT_Windows  = $(subst linux,win32,$(SWT_Linux))
 SWT_Linx_arm = 
 SWT_MacOS    = $(subst linux,macos,$(SWT_Linux))
@@ -22,7 +24,7 @@
 	@$(MSG) installing host-specific tools into $*/$(PACKAGE_NAME) ...
 	$(SH) XDCTOOLS_JAVA_HOME="$(JRE_$*)" ./get_iliad.ksh -h $* $*/$(PACKAGE_NAME)
 	@$(if $(SWT_$*),$(MSG) "    adding $(SWT_$*) ...")
-	$(if $(SWT_$*),mkdir $*/$(PACKAGE_NAME)/packages; $(UNZIP) $(SWT_$*) -d $*/$(PACKAGE_NAME)/packages)
+	$(if $(SWT_$*),mkdir $*/$(PACKAGE_NAME)/packages; $(XDCCPP) $(SWT_$*) $*/$(PACKAGE_NAME)/packages)
 	$(SH) ./get_host.ksh -h $* $*/xdchost/local
 	$(RM) $@; $(TOUCH) $@
 
diff --git a/src/bundles/xdccore/package.bld b/src/bundles/xdccore/package.bld
index baae719..7bdce0d 100644
--- a/src/bundles/xdccore/package.bld
+++ b/src/bundles/xdccore/package.bld
@@ -1,7 +1,7 @@
 Pkg.makePrologue = "include custom.mak";
 
 /* create a repository for all packages in this bundle */
-var repository = Pkg.addRepository("packages");
+var repository = Pkg.addRepository("packages", {search: true});
 
 /* compute the set of pkgs to put in this repository from the requires list */
 var imports = [];
@@ -17,6 +17,7 @@
 	    print("skipping host-specific package: " + pname);
 	    continue;
 	}
+
         /* get list of all releases supported by package pname */
         var rels = Build.getReleaseDescs(pname);
         for (var j = 0; j < rels.length; j++) {