summarylogtreecommitdiffstats
path: root/Smarter-fig2dev-detection.all.patch
blob: d00fe5afe0b7a0bd311f99e93726522f64a007cf (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
From 15cad0ff53ad39e569b796474ad534687ea33e32 Mon Sep 17 00:00:00 2001
From: <lrn1986@gmial.com>
Date: Wed, 20 Mar 2013 20:31:57 +0400
Subject: [PATCH 2/3] Smarter fig2dev detection

---
 configure.ac    | 5 +++++
 doc/Makefile.am | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7afd83d..a6d8bdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -654,6 +654,11 @@ AC_SUBST(PTH_CFLAGS)
 AC_SUBST(PTH_LIBS)
 
 #
+# Find fig2dev
+#
+AC_PATH_PROG([FIG2DEV], [fig2dev], [false])
+
+#
 # Check whether pthreads is available
 #
 if test "$have_w32_system" != yes; then
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 30330bb..42c7d4f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -45,16 +45,16 @@ yat2m: yat2m.c
 	$(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
 
 .fig.png:
-	fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@
+	$(FIG2DEV) -L png `test -f '$<' || echo '$(srcdir)/'`$< $@ || touch $@
 
 .fig.jpg:
-	fig2dev -L jpg `test -f '$<' || echo '$(srcdir)/'`$< $@
+	$(FIG2DEV) -L jpg `test -f '$<' || echo '$(srcdir)/'`$< $@ || touch $@
 
 .fig.eps:
-	fig2dev -L eps `test -f '$<' || echo '$(srcdir)/'`$< $@
+	$(FIG2DEV) -L eps `test -f '$<' || echo '$(srcdir)/'`$< $@ || touch $@
 
 .fig.pdf:
-	fig2dev -L pdf `test -f '$<' || echo '$(srcdir)/'`$< $@
+	$(FIG2DEV) -L pdf `test -f '$<' || echo '$(srcdir)/'`$< $@ || touch $@
 
 yat2m-stamp: $(myman_sources)
 	@rm -f yat2m-stamp.tmp
-- 
1.7.11