Defined a gr_sysconfdir in Makefile.common

Modified uses of etcdir to use gr_sysconfdir.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11185 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/Makefile.common b/Makefile.common
index 7bd35ce9a9f4d439498b848004baa013fc51f991..c0625c7cb24038e606e27f519bbee2c45b129848 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -118,6 +118,9 @@ exampledir = $(datadir)/gnuradio/examples
 docdir ?= $(datadir)/doc/$(PACKAGE)
 gr_docdir = $(docdir)-$(VERSION)
 
+# System configuration files
+gr_sysconfdir = $(sysconfdir)/$(PACKAGE)/conf.d
+
 # Other common defines; use "+=" to add to these
 STAMPS =
 MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT

diff --git a/gnuradio-core/Makefile.am b/gnuradio-core/Makefile.am
index c9cf1b1baf885b6ed1e0c994384d06f23c91ef6c..d5447c17a44e2aef905a4a18a25bb956df3eadba 100644 (file)
--- a/gnuradio-core/Makefile.am
+++ b/gnuradio-core/Makefile.am
@@ -29,5 +29,5 @@ SUBDIRS = src
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnuradio-core.pc
 
-etcdir = $(sysconfdir)/gnuradio/conf.d
+etcdir = $(gr_sysconfdir)
 dist_etc_DATA = gnuradio-core.conf

diff --git a/gr-audio-alsa/Makefile.am b/gr-audio-alsa/Makefile.am
index e2f67725ac090fbc5e8195e977873f8ba137bf50..443bc32108513c03a5f46b81824499090bd5c31c 100644 (file)
--- a/gr-audio-alsa/Makefile.am
+++ b/gr-audio-alsa/Makefile.am
@@ -26,5 +26,5 @@ SUBDIRS = src
 pkgconfigdir = $(libdir)/pkgconfig
 dist_pkgconfig_DATA = gnuradio-audio-alsa.pc
 
-etcdir = $(sysconfdir)/gnuradio/conf.d
+etcdir = $(gr_sysconfdir)
 dist_etc_DATA = gr-audio-alsa.conf

diff --git a/gr-audio-jack/Makefile.am b/gr-audio-jack/Makefile.am
index 8eeb9bffe0bb803a4c985ba8e9f3cf3f2150c267..99cfe844777e8d35458d5e0941b5a98d19b6e625 100644 (file)
--- a/gr-audio-jack/Makefile.am
+++ b/gr-audio-jack/Makefile.am
@@ -26,5 +26,5 @@ SUBDIRS = src
 pkgconfigdir = $(libdir)/pkgconfig
 dist_pkgconfig_DATA = gnuradio-audio-jack.pc
 
-etcdir = $(sysconfdir)/gnuradio/conf.d
+etcdir = $(gr_sysconfdir)
 dist_etc_DATA = gr-audio-jack.conf

diff --git a/gr-audio-oss/Makefile.am b/gr-audio-oss/Makefile.am
index 697c9a604c016f437ae207a2e76f6822dc36aded..9f460bc3a8c4c2103f907f8873a1703b3a183cb4 100644 (file)
--- a/gr-audio-oss/Makefile.am
+++ b/gr-audio-oss/Makefile.am
@@ -26,5 +26,5 @@ SUBDIRS = src
 pkgconfigdir = $(libdir)/pkgconfig
 dist_pkgconfig_DATA = gnuradio-audio-oss.pc
 
-etcdir = $(sysconfdir)/gnuradio/conf.d
+etcdir = $(gr_sysconfdir)
 dist_etc_DATA = gr-audio-oss.conf

diff --git a/gr-audio-portaudio/Makefile.am b/gr-audio-portaudio/Makefile.am
index 30a90647ec053b8f567d009f75ced9ca523a892d..8be2fa7346c208d9a8dd62e17f3fc7fea2293863 100644 (file)
--- a/gr-audio-portaudio/Makefile.am
+++ b/gr-audio-portaudio/Makefile.am
@@ -26,5 +26,5 @@ SUBDIRS = src
 pkgconfigdir = $(libdir)/pkgconfig
 dist_pkgconfig_DATA = gnuradio-audio-portaudio.pc
 
-etcdir = $(sysconfdir)/gnuradio/conf.d
+etcdir = $(gr_sysconfdir)
 dist_etc_DATA = gr-audio-portaudio.conf

diff --git a/gr-wxgui/Makefile.am b/gr-wxgui/Makefile.am
index 3e31fc435a5e90dd8dab7149bfa81dbe9ce1f567..e35ac649768cf87c012d3bbe8d5a9b7e2bed9e8d 100644 (file)
--- a/gr-wxgui/Makefile.am
+++ b/gr-wxgui/Makefile.am
@@ -29,7 +29,7 @@ EXTRA_DIST = \
 if PYTHON
 SUBDIRS = src
 
-etcdir = $(sysconfdir)/gnuradio/conf.d
+etcdir = $(gr_sysconfdir)
 dist_etc_DATA = gr-wxgui.conf
 
 pkgconfigdir = $(libdir)/pkgconfig