Move -DPATH_LIBDIR and -DSYSCONFDIR to Makefile.am

diff --git a/packaging/mm-hal-interface.spec b/packaging/mm-hal-interface.spec
index 0c11ff91cd32cf7d813f40ac613390c314bcb3a4..0f6c6b737c20ae73a8e52c87e3cb660c06777ee3 100755 (executable)
--- a/packaging/mm-hal-interface.spec
+++ b/packaging/mm-hal-interface.spec
@@ -103,8 +103,7 @@ gtest for codec HAL APIs.
 
 %build
 export CFLAGS+=" -D_LARGEFILE64_SOURCE"
-export CFLAGS+=" -DPATH_LIBDIR=\\\"%{_libdir}\\\""
-export CFLAGS+=" -D_LARGEFILE64_SOURCE -DSYSCONFDIR=\\\"%{_sysconfdir}\\\""
+export CFLAGS+=" -D_LARGEFILE64_SOURCE"
 ./autogen.sh
 %configure --disable-static
 make %{?jobs:-j%jobs}

diff --git a/src/radio/Makefile.am b/src/radio/Makefile.am
index fca117769fac4f2df0100d96138ecb664c51b112..0a4b21d6436753290b98cd094390caf0bf5ff5ad 100644 (file)
--- a/src/radio/Makefile.am
+++ b/src/radio/Makefile.am
@@ -1,5 +1,7 @@
 lib_LTLIBRARIES = libradio_hal_interface.la
 
+AM_CPPFLAGS = -DPATH_LIBDIR="\"$(libdir)\""
+
 libradio_hal_interface_la_SOURCES = radio_hal_interface.c
 libradio_hal_interface_la_CFLAGS = $(DLOG_CFLAGS) -I$(srcdir)/../../include/radio
 libradio_hal_interface_la_LIBADD = $(DLOG_LIBS) -ldl

diff --git a/testcase/codec/Makefile.am b/testcase/codec/Makefile.am
index 014213c57e06dc071622311ef719ceca8ed4ecac..51e7849ed9c30a337e41b946171a0461c968ce4b 100644 (file)
--- a/testcase/codec/Makefile.am
+++ b/testcase/codec/Makefile.am
@@ -1,6 +1,7 @@
 # with gtest
 bin_PROGRAMS = codec_haltests
 
+
 TEST_FILES_DIRECTORY = /usr/share/testcase/res/codec
 
 codec_haltests_SOURCES = \
@@ -17,7 +18,8 @@ codec_haltests_CPPFLAGS = \
        $(GST_ALLOCATORS_CFLAGS) \
        $(SYSTEM_INFO_CFLAGS) \
        -DTEST_FILES_PATH="\"$(TEST_FILES_DIRECTORY)\"" \
-       -I$(srcdir)/../../include/codec
+       -I$(srcdir)/../../include/codec \
+       -DSYSCONFDIR="\"$(sysconfdir)\""
 
 codec_haltests_LDADD = \
        -ldl\