Fix #19739: get rid of baseinstalldir

Conflicts:
	package.xml