summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunfeng Dong <junfeng.dong@intel.com>2013-03-25 10:15:18 (GMT)
committerlifang <fangx.li@intel.com>2013-03-28 21:29:44 (GMT)
commit28cc9516bc7f03797c583340094e191b2085677c (patch)
tree5cca1efa38cbe8f8c93594e892cac35823c12754
parentc78f38123385e110129a0c135065f6fb84df67cc (diff)
downloadavsystem-28cc9516bc7f03797c583340094e191b2085677c.zip
avsystem-28cc9516bc7f03797c583340094e191b2085677c.tar.gz
avsystem-28cc9516bc7f03797c583340094e191b2085677c.tar.bz2
Fix for new automake and 64 bit compatibility.
- Check for AM_PROG_AR with new automake - Make systemd related files install in /usr/lib for 64 bit compatibility. Change-Id: I1ef30ee3d83e419a03003a3b5b95a1841b0f25c1
-rw-r--r--configure.ac2
-rw-r--r--packaging/avsystem.spec12
2 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 0b681de..2df8b4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,8 @@ AC_HEADER_STDBOOL
AC_HEADER_STDC
AC_HEADER_TIME
AC_PROG_GCC_TRADITIONAL
+AM_PROG_CC_C_O
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_PROG_LIBTOOL
AC_ARG_ENABLE(sdk, AC_HELP_STRING([--enable-sdk], [sdk build]),
diff --git a/packaging/avsystem.spec b/packaging/avsystem.spec
index 35d1209..5064ad3 100644
--- a/packaging/avsystem.spec
+++ b/packaging/avsystem.spec
@@ -58,9 +58,9 @@ ln -s ../init.d/snd_init %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S15snd_init
mkdir -m 755 -p %{buildroot}/%{_sysconfdir}/rc.d/rc4.d/
ln -s ../init.d/snd_init %{buildroot}/%{_sysconfdir}/rc.d/rc4.d/S15snd_init
-mkdir -m 755 -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-install -m 0644 %SOURCE101 %{buildroot}%{_libdir}/systemd/system/avsystem.service
-ln -s ../avsystem.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/avsystem.service
+mkdir -m 755 -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
+install -m 0644 %SOURCE101 %{buildroot}/usr/lib/systemd/system/avsystem.service
+ln -s ../avsystem.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/avsystem.service
%preun
if [ $1 == 0 ]; then
@@ -86,11 +86,11 @@ systemctl daemon-reload
%{_sysconfdir}/rc.d/rc4.d/S15snd_init
%{_bindir}/*
%{_libdir}/lib*.so.*
-%{_libdir}/systemd/system/avsystem.service
-%{_libdir}/systemd/system/multi-user.target.wants/avsystem.service
+/usr/lib/systemd/system/avsystem.service
+/usr/lib/systemd/system/multi-user.target.wants/avsystem.service
%files devel
%manifest avsystem.manifest
%{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so
-/usr/include/avsystem/*.h
+%{_includedir}/avsystem/*.h