--- NsCDE/bin/mkpagemenu.orig 2021-05-02 07:39:06 UTC +++ NsCDE/bin/mkpagemenu @@ -31,13 +31,13 @@ do if [ -r "$FVWM_USERDIR/WSM.conf" ]; then pagenum_prepare=$(egrep "^PG:${pg}:.*:" "$FVWM_USERDIR/WSM.conf" | head -1) if [ "x${pagenum_prepare}" == "x" ]; then - if [ -r "${NSCDE_ROOT}/share/defaults/pages/${PagesX}x${PagesY}" ]; then - pagenum_prepare=$(egrep "^PG:${pg}:.*:" ${NSCDE_ROOT}/share/defaults/pages/${PagesX}x${PagesY} | head -1) + if [ -r "${PREFIX}/share/nscde/defaults/pages/${PagesX}x${PagesY}" ]; then + pagenum_prepare=$(egrep "^PG:${pg}:.*:" ${PREFIX}/share/nscde/defaults/pages/${PagesX}x${PagesY} | head -1) fi fi else - if [ -r "${NSCDE_ROOT}/share/defaults/pages/${PagesX}x${PagesY}" ]; then - pagenum_prepare=$(egrep "^PG:${pg}:.*:" ${NSCDE_ROOT}/share/defaults/pages/${PagesX}x${PagesY} | head -1) + if [ -r "${PREFIX}/share/nscde/defaults/pages/${PagesX}x${PagesY}" ]; then + pagenum_prepare=$(egrep "^PG:${pg}:.*:" ${PREFIX}/share/nscde/defaults/pages/${PagesX}x${PagesY} | head -1) fi fi @@ -50,7 +50,7 @@ do fi if [ "$Fmt" == "menu_icons" ]; then - if [ -r "$NSCDE_ROOT/share/icons/NsCDE/Wsm_${PagesX}x${PagesY}_${pagenum}.xpm" ]; then + if [ -r "${PREFIX}/share/icons/NsCDE/Wsm_${PagesX}x${PagesY}_${pagenum}.xpm" ]; then echo "+ \"&${pg} ${MenuLeftTitle}${pagename}%NsCDE/Wsm_${PagesX}x${PagesY}_${pagenum}.xpm%\" $FvwmPageCmd $pagenum_fvwm" else echo "+ \"&${pg} ${MenuLeftTitle}${pagename}\" $FvwmPageCmd $pagenum_fvwm"