3 files changed, 30 insertions, 15 deletions
diff --git a/baobab/pixmaps/Makefile.am b/baobab/pixmaps/Makefile.am
index f36e8bf3..6804bef9 100644
--- a/baobab/pixmaps/Makefile.am
+++ b/baobab/pixmaps/Makefile.am
@@ -11,8 +11,10 @@ public_icons = \
 hicolor_apps_scalable_mate-disk-usage-analyzer.svg \
 $(NULL)
 
+if HAVE_RSVG_CONVERT
 hicolor_apps_%.png: hicolor_apps_scalable_mate-disk-usage-analyzer.svg
 $(RSVG_CONVERT) -w $(word 1, $(subst x, ,$(word 1,$(subst _, ,$*)))) -h $(word 2, $(subst x, ,$(word 1,$(subst _, ,$*)))) $^ -o $@
+endif
 
 EXTRA_DIST = \
 $(public_icons) \
@@ -20,7 +22,7 @@ EXTRA_DIST = \
 
 ###############################################################################
 
-install-icons: $(public_icons)
+install-icons: | $(public_icons)
 for icon in $(public_icons); do \
 THEME=`echo $$icon | cut -d_ -f1`; \
 CONTEXT=`echo $$icon | cut -d_ -f2`; \
@@ -57,7 +59,7 @@ update-icon-cache:
 fi
 
 .PHONY: build-png-icons clean-png-icons
-build-png-icons: $(png_icons)
+build-png-icons: | $(png_icons)
 
 clean-png-icons:
 rm -f $(png_icons)
diff --git a/configure.ac b/configure.ac
index f1fe2e9d..e4c54bc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,13 +31,9 @@ AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums])
 
 dnl ICONS: convert svg to png
 AC_PATH_PROG(RSVG_CONVERT, rsvg-convert)
-if test x$RSVG_CONVERT = x ; then
- AC_MSG_ERROR([could not locate rsvg-convert])
-fi
+AM_CONDITIONAL([HAVE_RSVG_CONVERT], [test "x$RSVG_CONVERT" != x])
 AC_PATH_PROG(INKSCAPE, inkscape)
-if test x$INKSCAPE = x ; then
- AC_MSG_ERROR([could not locate inkscape])
-fi
+AM_CONDITIONAL([HAVE_INKSCAPE], [test "x$INKSCAPE" != x])
 
 MATE_COMPILE_WARNINGS([yes])
 
diff --git a/logview/data/icons/Makefile.am b/logview/data/icons/Makefile.am
index 9db44489..30fff904 100644
--- a/logview/data/icons/Makefile.am
+++ b/logview/data/icons/Makefile.am
@@ -17,20 +17,37 @@ public_icons = \
 hicolor_apps_scalable_mate-system-log-symbolic.svg \
 $(NULL)
 
+if HAVE_INKSCAPE
 hicolor_apps_16x16_mate-system-log.png: logview.svg
- $(INKSCAPE) -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@
+ $(if $(wildcard $(INKSCAPE)), \
+ $(info $(shell $(INKSCAPE) -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@)), \
+ $(error could not locate inkscape) \
+ )
 
 hicolor_apps_22x22_mate-system-log.png: logview.svg
- $(INKSCAPE) -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@
+ $(if $(wildcard $(INKSCAPE)), \
+ $(info $(shell $(INKSCAPE) -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@)), \
+ $(error could not locate inkscape) \
+ )
 
 hicolor_apps_32x32_mate-system-log.png: logview.svg
- $(INKSCAPE) -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@
+ $(if $(wildcard $(INKSCAPE)), \
+ $(info $(shell $(INKSCAPE) -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@)), \
+ $(error could not locate inkscape) \
+ )
 
 hicolor_apps_48x48_mate-system-log.png: logview.svg
- $(INKSCAPE) -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@
+ $(if $(wildcard $(INKSCAPE)), \
+ $(info $(shell $(INKSCAPE) -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@)), \
+ $(error could not locate inkscape) \
+ )
 
 hicolor_apps_256x256_mate-system-log.png: logview.svg
- $(INKSCAPE) -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@
+ $(if $(wildcard $(INKSCAPE)), \
+ $(info $(shell $(INKSCAPE) -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@)), \
+ $(error could not locate inkscape) \
+ )
+endif
 
 noinst_DATA = \
 logview.svg \
@@ -43,7 +60,7 @@ EXTRA_DIST = \
 
 ###############################################################################
 
-install-icons:
+install-icons: | $(public_icons)
 for icon in $(public_icons); do \
 THEME=`echo $$icon | cut -d_ -f1`; \
 CONTEXT=`echo $$icon | cut -d_ -f2`; \
@@ -80,7 +97,7 @@ update-icon-cache:
 fi
 
 .PHONY: build-png-icons clean-png-icons
-build-png-icons: $(png_icons)
+build-png-icons: | $(png_icons)
 
 clean-png-icons:
 rm -f $(png_icons)