more work on upstream Makefile to not ignore LDFLAGS