[Libreoffice-commits] online.git: Branch 'distro/cib/libreoffice-6-2' - configure.ac loleaflet/Makefile.am

[Samuel Mehrbrodt (via logerrit)]

 configure.ac          |   10 ----------
 loleaflet/Makefile.am |    4 ----
 2 files changed, 14 deletions(-)

New commits:
commit fbb6e93d5711a71c5824dd4a718ca09be18ff0cd
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Fri Jun 28 14:36:34 2019 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Fri Jun 28 14:36:34 2019 +0200

    Remove obsolete checks
    
    Duplicate/useless after c358ddc227038f55f4cff854ba73c95558a375bc

diff --git a/configure.ac b/configure.ac
index a6dd3ef5a..7d70a3635 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,16 +287,6 @@ else
 fi
 AC_SUBST(CUSTOM_ICONS_DIRECTORY)
 
-AC_MSG_CHECKING([for custom icon theme])
-CUSTOM_ICONS_DIRECTORY=
-if test -d "$with_icon_theme"; then
-    CUSTOM_ICONS_DIRECTORY=`readlink -f $with_icon_theme`
-    AC_MSG_RESULT([$CUSTOM_ICONS_DIRECTORY])
-else
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(CUSTOM_ICONS_DIRECTORY)
-
 ENABLE_GTKAPP=
 if test "$enable_gtkapp" = "yes"; then
    ENABLE_GTKAPP=true
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 3c76d5294..4608a6694 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -249,10 +249,6 @@ $(builddir)/dist/images/%: $(CUSTOM_ICONS_DIRECTORY)/%
 $(builddir)/dist/images/%: $(srcdir)/images/%
 	@mkdir -p $(dir $@)
 	@cp $< $@
-	@if test -d '$(CUSTOM_ICONS_DIRECTORY)'; then \
-		`cp -r "$(CUSTOM_ICONS_DIRECTORY)"/* $(builddir)/dist/images/`; \
-	fi
-
 
 $(builddir)/dist/%.html: $(srcdir)/html/%.html
 	@mkdir -p $(dir $@)