Use the correct Make variables in the .cpp .s .S and .asm rules to vpath works correctly.
Use the correct Make variables in the .cpp .s .S and .asm rules to vpath works
correctly.

remove the spurious vpath= line.

ekr/nss-old,ekr/nss-old,nmav/nss,nmav/nss,nmav/nss,nmav/nss,ekr/nss-old,ekr/nss-old,nmav/nss,nmav/nss,ekr/nss-old,nmav/nss,ekr/nss-old,ekr/nss-old