Missed a diff for nginx and some Makefile updates to make them more flexible.