diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index 129fc443..72c409b3 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -1351,7 +1351,7 @@ cmd_install() kernel_version=`run_chroot -q rpm -q kernel | sort -V | sed 's/_/-/g; s/\.\(i386\|x86_64\)$//; s/-[^.-]\+$//; s/^kernel-//'` # TODO: should be done by package manager post install script - run_chroot /opt/ytools/bin/jcs init + run_chroot /opt/jw-build/bin/jcs init make_etc_jcs_jcs_conf > $root/etc/jcs/jcs.conf diff --git a/scripts/jw-build-create-project.sh b/scripts/jw-build-create-project.sh index fac00550..d968f918 100644 --- a/scripts/jw-build-create-project.sh +++ b/scripts/jw-build-create-project.sh @@ -59,7 +59,7 @@ cat_make_proj_mk() ifeq (\$(TARGET),mingw) FLAVOUR_PATH_PREFIX = win32/ endif - MODDIR = \$(firstword \$(wildcard \$(CVS_PROJ_DIR)/ytools /opt/\$(FLAVOUR_PATH_PREFIX)ytools)) + MODDIR = \$(firstword \$(wildcard \$(CVS_PROJ_DIR)/jw-build /opt/\$(FLAVOUR_PATH_PREFIX)jw-build)) USE_PROJECT_LIB = false HDRDIR_SCOPE_SUFFIX = \$(PROJECT) @@ -78,11 +78,16 @@ cat_make_project_conf() [global] group = "$pkg_group" subpackages = $subpackages + license = LGPL 2 + jw-maintainer = $JANWARE_USER + + [build] + libname = none [pkg.required.jw] - run = ytools-run = VERSION - devel = $name-run = VERSION-REVISION, ytools-devel = VERSION - build = ytools-devel + run = jw-build-run = VERSION + devel = $name-run = VERSION-REVISION, jw-build-devel = VERSION + build = jw-build-devel EOT }