Merging r11186:11273 from grc branch.

[debian/gnuradio] / Makefile.common

diff --git a/Makefile.common b/Makefile.common
index b81433a32972d74e7164c1785869f38fbd12f84e..c0625c7cb24038e606e27f519bbee2c45b129848 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -20,11 +20,13 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-AM_CXXFLAGS = @autoconf_default_CXXFLAGS@
+AM_CFLAGS = @autoconf_default_CFLAGS@ @lf_CFLAGS@
+AM_CXXFLAGS = @autoconf_default_CXXFLAGS@ @lf_CXXFLAGS@
 
 # includes
 grincludedir = $(includedir)/gnuradio
 
+if PYTHON
 # swig includes
 swigincludedir = $(grincludedir)/swig
 
@@ -41,6 +43,7 @@ grpyexecdir = $(pyexecdir)/gnuradio
 
 usrppythondir = $(pythondir)/usrpm
 usrppyexecdir = $(pyexecdir)/usrpm
+endif
 
 # gcell includes
 gcellincludedir = $(includedir)/gcell
@@ -115,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