From 78a9dd6887ee4943ba33c610bc0f7f7ce58fece5 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 1 Jan 2024 20:14:35 +0100
Subject: [PATCH] move data/lcd4l => data/logos

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/b5a1974dd4f143d5b645f3f2a05de8c4e3022e5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2024-01-01 (Mon, 01 Jan 2024)

Origin message was:
------------------
- move data/lcd4l => data/logos

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 configure.ac                           |   2 +-
 data/Makefile.am                       |   6 +-----
 data/icons/Makefile.am                 |   3 ---
 data/lcd4l/Makefile.am                 |   5 -----
 data/logos/Makefile.am                 |  13 +++++++++++++
 data/{lcd4l => logos}/Moviebrowser.png | Bin
 data/{lcd4l => logos}/Movieplayer.png  | Bin
 7 files changed, 15 insertions(+), 14 deletions(-)
 delete mode 100644 data/lcd4l/Makefile.am
 create mode 100644 data/logos/Makefile.am
 rename data/{lcd4l => logos}/Moviebrowser.png (100%)
 rename data/{lcd4l => logos}/Movieplayer.png (100%)

diff --git a/configure.ac b/configure.ac
index 4c0ad8cc8..ea3b0b2f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -575,7 +575,7 @@ data/iso-codes/Makefile
 data/lcd/Makefile
 data/lcd/clock/Makefile
 data/lcd/icons/Makefile
-data/lcd4l/Makefile
+data/logos/Makefile
 data/license/Makefile
 data/locale/Makefile
 data/luaplugins/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index caf2042ce..cc72b96d7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,6 +8,7 @@ SUBDIRS = \
 	iso-codes \
 	license \
 	locale \
+	logos \
 	pictures \
 	policy \
 	scripts \
@@ -23,11 +24,6 @@ SUBDIRS += \
 	luaplugins
 endif
 
-if ENABLE_LCD4LINUX
-SUBDIRS += \
-	lcd4l
-endif
-
 if ENABLE_GRAPHLCD
 SUBDIRS += \
 	oled
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 31cbfe22c..2145ae72b 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -11,6 +11,3 @@ SUBDIRS = \
 	status \
 	various \
 	weather
-
-install-data-hook:
-	$(INSTALL) -d $(DESTDIR)/$(ICONSDIR)/logo
diff --git a/data/lcd4l/Makefile.am b/data/lcd4l/Makefile.am
deleted file mode 100644
index 2a23c2e57..000000000
--- a/data/lcd4l/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-installdir = $(ICONSDIR)/logo
-
-install_DATA = \
-	Moviebrowser.png \
-	Movieplayer.png
diff --git a/data/logos/Makefile.am b/data/logos/Makefile.am
new file mode 100644
index 000000000..db8f77ce0
--- /dev/null
+++ b/data/logos/Makefile.am
@@ -0,0 +1,13 @@
+installdir = $(LOGODIR)
+
+install_DATA =
+
+if ENABLE_LCD4LINUX
+install_DATA += \
+	Moviebrowser.png \
+	Movieplayer.png
+endif
+
+# ensure LOGODIR
+install-data-hook:
+	$(INSTALL) -d $(DESTDIR)/$(LOGODIR)
diff --git a/data/lcd4l/Moviebrowser.png b/data/logos/Moviebrowser.png
similarity index 100%
rename from data/lcd4l/Moviebrowser.png
rename to data/logos/Moviebrowser.png
diff --git a/data/lcd4l/Movieplayer.png b/data/logos/Movieplayer.png
similarity index 100%
rename from data/lcd4l/Movieplayer.png
rename to data/logos/Movieplayer.png