diff options
-rw-r--r-- | Makefile.common | 3 | ||||
-rw-r--r-- | gnuradio-core/Makefile.am | 2 | ||||
-rw-r--r-- | gr-audio-alsa/Makefile.am | 2 | ||||
-rw-r--r-- | gr-audio-jack/Makefile.am | 2 | ||||
-rw-r--r-- | gr-audio-oss/Makefile.am | 2 | ||||
-rw-r--r-- | gr-audio-portaudio/Makefile.am | 2 | ||||
-rw-r--r-- | gr-wxgui/Makefile.am | 2 |
7 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.common b/Makefile.common index 7bd35ce9a9..c0625c7cb2 100644 --- 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 c9cf1b1baf..d5447c17a4 100644 --- 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 e2f67725ac..443bc32108 100644 --- 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 8eeb9bffe0..99cfe84477 100644 --- 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 697c9a604c..9f460bc3a8 100644 --- 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 30a90647ec..8be2fa7346 100644 --- 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 3e31fc435a..e35ac64976 100644 --- 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 |