X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=using_make_for_science.Rnw;h=2fee8e94ee34bcf3f56847ca8f9112ef4054a53d;hb=a58898c9eb5ffe7aad59a60ea46ee121154440dd;hp=12ce5e7f07bf7c07053283d722fc0a1e2b9733b5;hpb=bc49471caf76b388c9949075085030e7ce28badc;p=using_make_for_science.git

diff --git a/using_make_for_science.Rnw b/using_make_for_science.Rnw
index 12ce5e7..2fee8e9 100644
--- a/using_make_for_science.Rnw
+++ b/using_make_for_science.Rnw
@@ -200,8 +200,8 @@ TARGETS: PREREQUISITES
     value is assigned at the moment the variable is created
   \end{itemize}
 \item Variables can come from the environment and can be overridden on
-  the command line: \mintinline{shell}{make FOO=bleargh} or
-  \mintinline{shell}{FOO=blah make}.
+  the command line: \mintinline{shell}{FOO=blah make} or
+  \mintinline{shell}{make FOO=bleargh}.
 \item \mintinline{make}{$@} -- target name %$
 \item \mintinline{make}{$*} -- current stem %$ 
 \item \mintinline{make}{$^} -- all prerequisites %$
@@ -214,7 +214,7 @@ TARGETS: PREREQUISITES
 
 \begin{frame}[fragile]{Some Functions}
   \begin{itemize}
-  \item \mintinline{make}{$(patsubst %.bam,%.sam,foo.sam bar.sam)} %$
+  \item \mintinline{make}{$(patsubst %.sam,%.bam,foo.sam bar.sam)} %$
       -- returns foo.bam bar.bam.
   \item \mintinline{make}{$(filter-out %.bam,foo.sam bar.bam)} %$
       -- returns foo.sam
@@ -271,7 +271,7 @@ clean:
 
 \begin{frame}[fragile]{Special Targets}
 \begin{minted}[showtabs]{make}
-%.fasta.gz: %.fasta
+%.fasta: %.fasta.gz
 	gzip -dc $< > $@
 
 %.bam: %.sam