From 962a07911c1e3f74b36f1fdb76d5af752e8dedce Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 15 Nov 2017 10:24:14 +0100
Subject: [PATCH] hdspmixer: move .desktop and icon files to desktop, use
 modern destination for icons

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 .gitignore                                    |   1 +
 hdspmixer/Makefile.am                         |   7 ++--
 hdspmixer/configure.ac                        |  21 +----------
 hdspmixer/desktop/Makefile.am                 |  34 ++++++++++++++++++
 hdspmixer/{ => desktop}/hdspmixer.desktop     |   0
 .../hicolor_apps_48x48_hdspmixer.png}         | Bin
 hdspmixer/pixmaps/Makefile.am                 |   3 +-
 7 files changed, 39 insertions(+), 27 deletions(-)
 create mode 100644 hdspmixer/desktop/Makefile.am
 rename hdspmixer/{ => desktop}/hdspmixer.desktop (100%)
 rename hdspmixer/{pixmaps/hdspmixer.png => desktop/hicolor_apps_48x48_hdspmixer.png} (100%)

diff --git a/.gitignore b/.gitignore
index c5debca..f765810 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,7 @@ hdspmixer/Makefile
 hdspmixer/configure
 hdspmixer/src/hdspmixer
 hdspmixer/pixmaps/Makefile
+hdspmixer/desktop/Makefile
 hdspmixer/src/Makefile
 hdsploader/Makefile
 hdsploader/configure
diff --git a/hdspmixer/Makefile.am b/hdspmixer/Makefile.am
index 86a759c..85c1177 100644
--- a/hdspmixer/Makefile.am
+++ b/hdspmixer/Makefile.am
@@ -1,8 +1,5 @@
-EXTRA_DIST = gitcompile hdspmixer.desktop depcomp
-SUBDIRS = src pixmaps
-
-desktopdir = $(DESKTOP_DIR)
-desktop_DATA = hdspmixer.desktop
+EXTRA_DIST = gitcompile depcomp
+SUBDIRS = src pixmaps desktop
 
 alsa-dist: distdir
 	@rm -rf ../distdir/hdspmixer
diff --git a/hdspmixer/configure.ac b/hdspmixer/configure.ac
index 0b32dba..167e4f4 100644
--- a/hdspmixer/configure.ac
+++ b/hdspmixer/configure.ac
@@ -9,25 +9,6 @@ AC_PATH_X
 
 AM_PATH_ALSA(1.0.0)
 
-dnl desktop install
-AC_ARG_WITH(desktop-dir,
-  [ --with-desktop-dir  specify the path to install desktop file],
-  [desktopdir="$withval"], [desktopdir=""])
-if test -z "$desktopdir"; then
-  desktopdir=$datadir/applications
-fi
-DESKTOP_DIR="$desktopdir"
-AC_SUBST(DESKTOP_DIR)
-	
-AC_ARG_WITH(pixmap-dir,
-  [ --with-pixmap-dir  specify the path to install desktop pixmap file],
-  [pixmapdir="$withval"], [pixmapdir=""])
-if test -z "$pixmapdir"; then
-  pixmapdir=$datadir/pixmaps
-fi
-PIXMAP_DIR="$pixmapdir"
-AC_SUBST(PIXMAP_DIR)
-
 dnl library check
 AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
 if test "$FLTK_CONFIG" = "no" && ! test "`hostname -f`" = "alsa.alsa-project.org"; then
@@ -39,4 +20,4 @@ FLTK_LIBS="`$FLTK_CONFIG --ldflags`"
 CXXFLAGS="$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS"
 LIBS="$LIBS $ALSA_LIBS $FLTK_LIBS"
 
-AC_OUTPUT(Makefile src/Makefile pixmaps/Makefile)
+AC_OUTPUT(Makefile src/Makefile pixmaps/Makefile desktop/Makefile)
diff --git a/hdspmixer/desktop/Makefile.am b/hdspmixer/desktop/Makefile.am
new file mode 100644
index 0000000..adafcd8
--- /dev/null
+++ b/hdspmixer/desktop/Makefile.am
@@ -0,0 +1,34 @@
+APPNAME = hdspmixer
+
+desktopdir = $(datadir)/applications
+desktop_DATA = $(APPNAME).desktop
+
+public_icons = \
+	hicolor_apps_48x48_$(APPNAME).png
+
+EXTRA_DIST = \
+	$(public_icons)		\
+	$(desktop_DATA)
+
+install-icons:
+	for icon in $(public_icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
+
+uninstall-icons:
+	-for icon in $(public_icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
+
+install-data-local: install-icons
+
+uninstall-local: uninstall-icons
diff --git a/hdspmixer/hdspmixer.desktop b/hdspmixer/desktop/hdspmixer.desktop
similarity index 100%
rename from hdspmixer/hdspmixer.desktop
rename to hdspmixer/desktop/hdspmixer.desktop
diff --git a/hdspmixer/pixmaps/hdspmixer.png b/hdspmixer/desktop/hicolor_apps_48x48_hdspmixer.png
similarity index 100%
rename from hdspmixer/pixmaps/hdspmixer.png
rename to hdspmixer/desktop/hicolor_apps_48x48_hdspmixer.png
diff --git a/hdspmixer/pixmaps/Makefile.am b/hdspmixer/pixmaps/Makefile.am
index c81fc95..c1cdf2c 100644
--- a/hdspmixer/pixmaps/Makefile.am
+++ b/hdspmixer/pixmaps/Makefile.am
@@ -1,4 +1,3 @@
 pixmapdir = $(PIXMAP_DIR)
-pixmap_DATA = hdspmixer.png
 
-EXTRA_DIST = $(wildcard *.xpm) hdspmixer.png
+EXTRA_DIST = $(wildcard *.xpm)
-- 
2.47.1