summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
-rw-r--r--data/Makefile.am2
-rw-r--r--data/config (renamed from src/config.ini)0
-rw-r--r--src/Makefile.am3
-rw-r--r--src/config.c2
6 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index af437a6..9768a98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = src
+SUBDIRS = src data
diff --git a/configure.ac b/configure.ac
index 1ef1992..0e1d627 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AM_SILENT_RULES([yes])
AC_CONFIG_SRCDIR([src/pa-sink-ctl.c])
AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile data/Makefile])
# Checks for programs.
AC_PROG_CC
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..83b78bc
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,2 @@
+pa_sink_ctl_xdgdir = $(sysconfdir)/xdg/pa-sink-ctl
+dist_pa_sink_ctl_xdg_DATA = config
diff --git a/src/config.ini b/data/config
index cd658f1..cd658f1 100644
--- a/src/config.ini
+++ b/data/config
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d527f6..19decc4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,6 +12,3 @@ AM_CPPFLAGS = $(PULSE_CFLAGS) $(PULSE_MAINLOOP_CFLAGS) $(GLIB_CFLAGS) \
pa_sink_ctl_LDADD = $(GLIB_LIBS) $(PULSE_LIBS) $(PULSE_MAINLOOP_LIBS) $(CURSES_LIBS)
noinst_HEADERS = interface.h command.h config.h pa-sink-ctl.h sink.h unix_signal.h
-
-pa_sink_ctl_xdgdir = $(sysconfdir)/xdg/pa-sink-ctl
-dist_pa_sink_ctl_xdg_DATA = config.ini
diff --git a/src/config.c b/src/config.c
index 41dad73..34ccc90 100644
--- a/src/config.c
+++ b/src/config.c
@@ -168,7 +168,7 @@ config_init(struct config *cfg)
for (i = 0; i < G_N_ELEMENTS(dirs_array); ++i) {
error = NULL;
if (g_key_file_load_from_dirs(cfg->keyfile,
- "pa-sink-ctl/config.ini",
+ "pa-sink-ctl/config",
(const gchar **) dirs_array[i],
NULL, G_KEY_FILE_NONE, &error)
&& !error)