--- ./Makefile.orig	2013-10-19 17:19:23.064145798 -0500
+++ ./Makefile	2013-10-19 17:19:37.904136233 -0500
@@ -3,27 +3,27 @@
 CFLAGS=-Werror -g -I src -I.
 
 nfsping: src/nfsping.c src/nfsping.h src/nfs_prot_clnt.c src/mount_clnt.c src/util.c src/rpc.c
-	gcc ${CFLAGS} src/nfsping.c src/nfs_prot_clnt.c src/nfs_prot_xdr.c src/mount_clnt.c src/mount_xdr.c src/util.c src/rpc.c -o $@
+	$(CC) ${CFLAGS} src/nfsping.c src/nfs_prot_clnt.c src/nfs_prot_xdr.c src/mount_clnt.c src/mount_xdr.c src/util.c src/rpc.c -o $@
 
 src/nfs_prot.h src/nfs_prot_clnt.c src/nfs_prot_svc.c src/nfs_prot_xdr.c: src/nfs_prot.x
-	rpcgen -DWANT_NFS3 $<
+	cd src && rpcgen -DWANT_NFS3 `basename $<`
 
 src/mount.h src/mount_clnt.c src/mount_svc.c src/mount_xdr.c: src/mount.x
-	rpcgen -DWANT_NFS3 $<
+	cd src && rpcgen -DWANT_NFS3 `basename $<`
 
 nfsmount: src/mount.c src/nfsping.h src/mount_clnt.c src/mount_xdr.c src/rpc.c
-	gcc ${CFLAGS} $^ -o $@
+	$(CC) ${CFLAGS} $^ -o $@
 
 nfsdf: src/df.c src/nfsping.h src/nfs_prot_clnt.c src/nfs_prot_xdr.c src/util.c 
-	gcc ${CFLAGS} $^ -o $@
+	$(CC) ${CFLAGS} $^ -o $@
 
 nfsls: src/ls.c src/nfs_prot_clnt.c src/nfs_prot_xdr.c src/util.c src/rpc.c
-	gcc ${CFLAGS} $^ -o $@
+	$(CC) ${CFLAGS} $^ -o $@
 
 nfscat: src/cat.c src/nfs_prot_clnt.c src/nfs_prot_xdr.c src/util.c src/rpc.c
-	gcc ${CFLAGS} $^ -o $@
+	$(CC) ${CFLAGS} $^ -o $@
 
 tests: tests/util_tests
 
 tests/util_tests: tests/util_tests.c tests/minunit.h src/util.c src/util.h
-	gcc ${CFLAGS} tests/util_tests.c src/util.c -o $@
+	$(CC) ${CFLAGS} tests/util_tests.c src/util.c -o $@