--- src/Makefile.in.orig	2013-11-15 11:18:27.000000000 -0500
+++ src/Makefile.in	2013-11-15 11:21:02.000000000 -0500
@@ -2,13 +2,12 @@
 
 OCTFILES= mshm_refine.oct mshm_dolfin_read.oct mshm_dolfin_write.oct
 
-CPPFLAGS += @ac_dolfin_cpp_flags@
-LDFLAGS += @ac_dolfin_ld_flags@
-
 all: $(OCTFILES)
 
 %.oct:  %.cc
-	$(MKOCTFILE) $(CPPFLAGS) $< $(LDFLAGS)
+	CPPFLAGS='$(CPPFLAGS) @ac_dolfin_cpp_flags@' \
+	LDFLAGS='$(LDFLAGS) @ac_dolfin_ld_flags@' \
+	$(MKOCTFILE) $<
 
 clean:
 	-rm -f *.o core octave-core *.oct *~ *.xml