[Commit-gnuradio] r11185 - in gnuradio/trunk: . gnuradio-core gr-audio-alsa gr-audio-jack gr-audio-oss gr-audio-portaudio gr-wxgui

[jblum]

Author: jblum
Date: 2009-06-13 16:35:37 -0600 (Sat, 13 Jun 2009)
New Revision: 11185

Modified:
   gnuradio/trunk/Makefile.common
   gnuradio/trunk/gnuradio-core/Makefile.am
   gnuradio/trunk/gr-audio-alsa/Makefile.am
   gnuradio/trunk/gr-audio-jack/Makefile.am
   gnuradio/trunk/gr-audio-oss/Makefile.am
   gnuradio/trunk/gr-audio-portaudio/Makefile.am
   gnuradio/trunk/gr-wxgui/Makefile.am
Log:
Defined a gr_sysconfdir in Makefile.common
Modified uses of etcdir to use gr_sysconfdir.



Modified: gnuradio/trunk/Makefile.common
===================================================================
--- gnuradio/trunk/Makefile.common      2009-06-13 21:26:25 UTC (rev 11184)
+++ gnuradio/trunk/Makefile.common      2009-06-13 22:35:37 UTC (rev 11185)
@@ -118,6 +118,9 @@
 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

Modified: gnuradio/trunk/gnuradio-core/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/Makefile.am    2009-06-13 21:26:25 UTC (rev 
11184)
+++ gnuradio/trunk/gnuradio-core/Makefile.am    2009-06-13 22:35:37 UTC (rev 
11185)
@@ -29,5 +29,5 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnuradio-core.pc
 
-etcdir = $(sysconfdir)/gnuradio/conf.d
+etcdir = $(gr_sysconfdir)
 dist_etc_DATA = gnuradio-core.conf

Modified: gnuradio/trunk/gr-audio-alsa/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-alsa/Makefile.am    2009-06-13 21:26:25 UTC (rev 
11184)
+++ gnuradio/trunk/gr-audio-alsa/Makefile.am    2009-06-13 22:35:37 UTC (rev 
11185)
@@ -26,5 +26,5 @@
 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

Modified: gnuradio/trunk/gr-audio-jack/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-jack/Makefile.am    2009-06-13 21:26:25 UTC (rev 
11184)
+++ gnuradio/trunk/gr-audio-jack/Makefile.am    2009-06-13 22:35:37 UTC (rev 
11185)
@@ -26,5 +26,5 @@
 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

Modified: gnuradio/trunk/gr-audio-oss/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-oss/Makefile.am     2009-06-13 21:26:25 UTC (rev 
11184)
+++ gnuradio/trunk/gr-audio-oss/Makefile.am     2009-06-13 22:35:37 UTC (rev 
11185)
@@ -26,5 +26,5 @@
 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

Modified: gnuradio/trunk/gr-audio-portaudio/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/Makefile.am       2009-06-13 21:26:25 UTC 
(rev 11184)
+++ gnuradio/trunk/gr-audio-portaudio/Makefile.am       2009-06-13 22:35:37 UTC 
(rev 11185)
@@ -26,5 +26,5 @@
 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

Modified: gnuradio/trunk/gr-wxgui/Makefile.am
===================================================================
--- gnuradio/trunk/gr-wxgui/Makefile.am 2009-06-13 21:26:25 UTC (rev 11184)
+++ gnuradio/trunk/gr-wxgui/Makefile.am 2009-06-13 22:35:37 UTC (rev 11185)
@@ -29,7 +29,7 @@
 if PYTHON
 SUBDIRS = src
 
-etcdir = $(sysconfdir)/gnuradio/conf.d
+etcdir = $(gr_sysconfdir)
 dist_etc_DATA = gr-wxgui.conf
 
 pkgconfigdir = $(libdir)/pkgconfig