Changeset 1cdfa82 for doc/papers/general/Makefile

Timestamp:

Apr 25, 2018, 4:55:53 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into with_gc

File:

• doc/papers/general/Makefile (modified) (3 diffs)

doc/papers/general/Makefile

@@ -3 +3 @@
 Build = build
 Figures = figures
-Macros = AMA/AMA-stix/ama
+Macros = ../AMA/AMA-stix/ama
 TeXLIB = .:${Macros}:${Build}:../../bibliography:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
@@ -51 +51 @@
 
 ${BASE}.ps : ${BASE}.dvi
-        dvips -o $@ ${Build}/$<
+        dvips ${Build}/$< -o $@
 
 ${BASE}.dvi : Makefile ${Build} ${BASE}.out.ps WileyNJD-AMA.bst ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
@@ -70 +70 @@
 
 ${BASE}.out.ps:
-        ln -s build/Paper.out.ps .
+        ln -fs build/Paper.out.ps .
 
 WileyNJD-AMA.bst:
-        ln -s AMA/AMA-stix/ama/WileyNJD-AMA.bst .
+        ln -fs ../AMA/AMA-stix/ama/WileyNJD-AMA.bst .
 
 ${GRAPHS} : timing.gp timing.dat