[Pkg-wmaker-commits] [wmcdplay] 48/79: wmcdplay: Change artwork installation directory.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmcdplay.

commit 096e7854d9c87dea68b8d6d1ec4629dae1ecb4c9
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Thu Dec 18 12:30:47 2014 -0600

    wmcdplay: Change artwork installation directory.
    
    Switch from deprecated X11R6 directory to conform to Filesystem Hierarcy
    Standards.
    
    Adapted from the original Debian patch by Marcelo E. Magallon
    <mmagallo at debian.org> [1] to take advantage of automake.
    
    [1] http://sources.debian.net/src/wmcdplay/1.0beta1-13/debian/patches/change_artwork_dir.patch/
---
 Makefile.am | 2 ++
 wmcdplay.cc | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 8cbcfb4..1c3819c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,6 @@
 bin_PROGRAMS = wmcdplay
 wmcdplay_SOURCES = cdctl.h cdctl_freebsd.h wmcdplay.cc
 AM_CFLAGS = $(x11_CFLAGS) $(xpm_CFLAGS) $(xext_CFLAGS)
+AM_CPPFLAGS = -DSYSARTDIR=\"$(pkgdatadir)\"
 LIBS += $(x11_LIBS) $(xpm_LIBS) $(xext_LIBS)
+pkgdata_DATA = XPM/bluered.art XPM/grey.art XPM/newstyle.art XPM/wmcd.art
diff --git a/wmcdplay.cc b/wmcdplay.cc
index c60ef48..78c544b 100644
--- a/wmcdplay.cc
+++ b/wmcdplay.cc
@@ -20,7 +20,6 @@
 #define CLASS       "WMCDPlay"
 
 // User defines - custom
-#define SYSARTDIR   "/usr/X11R6/lib/X11/wmcdplay/"
 #define CDDEV       "/dev/cdrom"
 #define BACKCOLOR   "#282828"
 #define LEDCOLOR    "green"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcdplay.git