summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac4
-rw-r--r--doc/faq/Makefile.am12
-rw-r--r--doc/hackersguide/Makefile.am9
3 files changed, 9 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac
index cab74c3c7..eed70449c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1985,10 +1985,10 @@ dnl Check for documentation formatting tool
dnl ---------------------------------------------
AC_CHECK_PROG(SGMLTOOLS, sgmltools, sgmltools, no)
-AM_CONDITIONAL([HAVE_SGMLTOOLS], [test "$sgmltools" != "no"])
+AM_CONDITIONAL([HAVE_SGMLTOOLS], [test "$SGMLTOOLS" != "no"])
AC_CHECK_PROG(FIG2DEV, fig2dev, fig2dev, no)
-AM_CONDITIONAL([HAVE_FIG2DEV], [test "$fig2dev" != "no"])
+AM_CONDITIONAL([HAVE_FIG2DEV], [test "$FIG2DEV" != "no"])
dnl ---------------------------------------------
dnl Newest automake workaround
diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am
index d57e08cf9..f534d867a 100644
--- a/doc/faq/Makefile.am
+++ b/doc/faq/Makefile.am
@@ -26,15 +26,13 @@ faq.html: faq.sgml
$(SGMLTOOLS) -b onehtml faq.sgml;
else
faq.html: faq.sgml
- if test "$(fail_if_missing)" = "yes"; then \
+ if test x"$(fail_if_missing)" = x"yes"; then \
echo "Please install sgmltools-lite."; \
exit 1; \
else \
touch $@; \
- sleep 1; \
touch $^; \
- fi; \
- fi
+ fi
endif
if HAVE_SGMLTOOLS
@@ -42,13 +40,11 @@ faq.txt: faq.sgml
$(SGMLTOOLS) -b txt faq.sgml;
else
faq.txt: faq.sgml
- if test "$(fail_if_missing)" = "yes"; then \
+ if test x"$(fail_if_missing)" = x"yes"; then \
echo "Please install sgmltools-lite."; \
exit 1; \
else \
touch $@; \
- sleep 1; \
touch $^; \
- fi; \
- fi
+ fi
endif
diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am
index f26e3e320..47455bcb4 100644
--- a/doc/hackersguide/Makefile.am
+++ b/doc/hackersguide/Makefile.am
@@ -36,14 +36,13 @@ hackersguide.html: $(hackersguide_sgml)
$(SGMLTOOLS) -b onehtml hackersguide.sgml;
else
hackersguide.html: $(hackersguide_sgml)
- if test "$(fail_if_missing)" = "yes"; then \
+ if test x"$(fail_if_missing)" = x"yes"; then \
echo "Please install sgmltools-lite."; \
exit 1; \
else \
touch $@; \
- sleep 1; \
touch $^; \
- fi;
+ fi
endif
if HAVE_FIG2DEV
@@ -51,13 +50,11 @@ if HAVE_FIG2DEV
$(FIG2DEV) -L png -S 4 $< $@;
else
%.png: $(srcdir)/%.fig
- if test "$(fail_if_missing)" = "yes"; then \
+ if test x"$(fail_if_missing)" = x"yes"; then \
echo "Please install fig2dev."; \
exit 1; \
else \
touch $@; \
- sleep 1; \
touch $^; \
- fi; \
fi
endif