summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hartwig <mandyke@gmail.com>2012-06-03 11:17:05 +0800
committerDaniel Hartwig <mandyke@gmail.com>2012-06-03 11:17:05 +0800
commit00c45e920d714a01ab68496b0aca6046ada8eb8f (patch)
tree13650a74b10dee710986efcec8d7628a4d952b25
parentba2a6bd1cd60d6caada5b75ea957ce06c0b13ff3 (diff)
downloadaptitude-00c45e920d714a01ab68496b0aca6046ada8eb8f.tar.gz
Use RSVG_CONVERT in build files
-rw-r--r--buildlib/docbook.mk4
-rw-r--r--configure.ac4
2 files changed, 4 insertions, 4 deletions
diff --git a/buildlib/docbook.mk b/buildlib/docbook.mk
index b9a5432a..9a0cfa48 100644
--- a/buildlib/docbook.mk
+++ b/buildlib/docbook.mk
@@ -109,10 +109,10 @@ $(DOCBOOK_MANS): $(findstring docbook-man,$(DOCBOOK_TARGETS))
$(README): $(findstring docbook-readme,$(DOCBOOK_TARGETS))
$(aptitude.pdf): $(findstring docbook-pdf,$(DOCBOOK_TARGETS)
-if HAVE_RSVGCONVERT
+if HAVE_RSVG_CONVERT
images/%.png: images/%.svg
- $(RSVGCONVERT) -x 1.5 -y 1.5 -f png -o $@ $<
+ $(RSVG_CONVERT) -x 1.5 -y 1.5 -f png -o $@ $<
endif
diff --git a/configure.ac b/configure.ac
index 1366f75d..f8b326ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,12 +16,12 @@ AC_PROG_RANLIB
dnl Checks for programs used to generate the documentation.
AC_PATH_PROG(PO4A, po4a)
AC_PATH_PROG(XSLTPROC, xsltproc)
-AC_PATH_PROG(RSVGCONVERT, rsvg-convert)
+AC_PATH_PROG(RSVG_CONVERT, rsvg-convert)
AC_PATH_PROG(FOP, fop)
AM_CONDITIONAL(HAVE_PO4A, [test "x$PO4A" != "x"])
AM_CONDITIONAL(HAVE_XSLTPROC, [test "x$XSLTPROC" != "x"])
-AM_CONDITIONAL(HAVE_RSVGCONVERT, [test "x$RSVGCONVERT" != "x"])
+AM_CONDITIONAL(HAVE_RSVG_CONVERT, [test "x$RSVG_CONVERT" != "x"])
AM_CONDITIONAL(HAVE_FOP, [test "x$FOP" != "x"])
dnl C++ has const and inline!!!