Index: science/eclass/octave-forge.eclass =================================================================== --- science/eclass/octave-forge.eclass (revision 908) +++ science/eclass/octave-forge.eclass (working copy) @@ -114,7 +114,7 @@ echo "new_package = struct();" >> "${OCT_TMP}" # add archprefix; needed for >=octave-2.9.15 - local libexec_dir="$(octave-config -p LIBEXECDIR)/octave/packages" + local libexec_dir="$(octave-config -p LIBEXECDIR)/octave/packages/${OCT_PKG}" echo "new_package.archprefix = \"${libexec_dir}\";" \ >> "${OCT_TMP}" @@ -125,6 +125,9 @@ echo "temp = struct(\"operator\",\"${operator}\",\"package\",\"${pkg_name}\",\"version\",\"${version}\");" >> "${OCT_TMP}" echo "foo = {temp};" >> "${OCT_TMP}" echo "new_package.depends = foo;" >> "${OCT_TMP}" + elif [[ ${keys[count]} == "name" ]]; then + # make name lower case + echo "new_package.name = lower(\"${values[count]}\");" >> "${OCT_TMP}" else echo "new_package.${keys[count]} = \"${values[count]}\";" >> "${OCT_TMP}" fi @@ -177,7 +180,7 @@ old_packages = load ("${OCT_DATABASE}").global_packages; global_packages = {}; for i=1:length(old_packages); -if ( !strcmp(old_packages{i}.name,"${remove_name}")); +if ( !strcmpi(old_packages{i}.name,"${remove_name}")); global_packages = {global_packages{:}, old_packages{i}}; endif; endfor; save ("${OCT_DATABASE}","global_packages"); EOF @@ -258,7 +261,8 @@ # install mex/oct files if present if [[ -n "${oct_files}" || -n "${mex_files}" ]]; then - insinto "${OCT_INSTALL_PKG}/${octave_arch}" + local libexec_dir="$(octave-config -p LIBEXECDIR)/octave/packages" + insinto "${libexec_dir}/${OCT_PKG}/${octave_arch}" if [[ -n "${oct_files}" ]]; then doins src/*.oct \ || die "failed to install oct files" @@ -272,6 +276,7 @@ # include PKG_ADD and PKG_DEL # TODO: need to scan included *.m *.cc files for # additional PKG_ADD/PKG_DEL commands for appending + insinto "${OCT_INSTALL_PKG}" if [[ -e "${S}/PKG_ADD" ]]; then doins "${S}/PKG_ADD" \ || die "failed to install PKG_ADD"