Fixes in Makefile to support custom PSRDADA_DIR