Fix replacement of @ETCDIR@

The variable $(ETCDIR) contains the $(DEST) prefix used for packaging
purposes. By using $(etc_prefix) it is ensured that only the actual
location will be used for replacing the variable in the file and not
some temporary path.
Merge branch 'portable' into macosx