needed changes for core.mk extra endif