From dd42858718465d8e7a04c63cebebb0ab2f36ea97 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Thu, 1 Apr 2021 10:22:40 +0300
Subject: [PATCH 1/2] fix xmp-cli not respecting system xmp.conf.

src/Makefile.am defined SYSCONFDIR as ${sysconfdir}, but installed
xmp.conf under ${sysconfdir}//${PACKAGE_NAME}. therefore, changing
the SYSCONFDIR define to reflect reality.

Patch from RedHat rpm repositories. Original bug report:
https://bugzilla.redhat.com/show_bug.cgi?id=1365321

Closes: https://github.com/libxmp/xmp-cli/issues/27
---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 15500d9..a150788 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 
-AM_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\" ${LIBXMP_CFLAGS} \
+AM_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}/${PACKAGE_NAME}\" ${LIBXMP_CFLAGS} \
               ${alsa_CFLAGS} ${pulseaudio_CFLAGS}
 AM_CFLAGS   = -Wall
 

From f4e66550d2c206f1087c357e599880269cbe3e5f Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Thu, 1 Apr 2021 10:25:40 +0300
Subject: [PATCH 2/2] read_config.c: define SYSCONFDIR as ".", if not already
 defined.

Just to be safe. (and would help with cases where one might use
standalone makefiles and not autotools.)
---
 src/read_config.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/read_config.c b/src/read_config.c
index 6e38c76..83c16be 100644
--- a/src/read_config.c
+++ b/src/read_config.c
@@ -17,6 +17,10 @@
 #include <sys/unistd.h>
 #endif
 
+#if !defined(SYSCONFDIR)
+#define SYSCONFDIR "."
+#endif
+
 static char driver[32];
 static char instrument_path[256];