Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-19 14:43:30 +02:00
Code Issues Projects Releases Wiki Activity

2021-05-19 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed hard-coded ${libdir} paths in 'configure.ac'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-05-19 12:26:28 -04:00
parent 76b71d0fdd
commit 352f18eddd
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -21710,3 +21710,5 @@
* Fixed typos in 'debian/control'.
* Implemented 'postinst', 'prerm' and 'postrm' script for
DEB packages.
2021-05-19 Fred Gleason <fredg@paravelsystems.com>
* Removed hard-coded ${libdir} paths in 'configure.ac'.

16
configure.ac
View File

@ -136,13 +136,7 @@ AC_SUBST(QT_LRELEASE,$LRELEASE_NAME)
AR_GCC_TARGET()
AC_SUBST(VENDOR,$ar_gcc_distro)
AC_SUBST(ARCH,$ar_gcc_arch)
if test $ar_gcc_arch = x86_64 ; then
LIB_PATH=$PREFIX/lib64
AC_SUBST(RD_LIB_PATH,lib64)
else
LIB_PATH=$PREFIX/lib
AC_SUBST(RD_LIB_PATH,lib)
fi
AC_SUBST(RD_LIB_PATH,${libdir})
#
# Determine number of available CPU cores for building packages
@ -358,10 +352,10 @@ if test $HPI_FOUND ; then
USING_HPI=yes
AC_DEFINE(HPI,yes)
AC_SUBST(LIBHPI,"-lrdhpi -lhpi")
AC_SUBST(HPI_FILE1,$LIB_PATH/librdhpi-$VERSION.so)
AC_SUBST(HPI_FILE2,$LIB_PATH/librdhpi.a)
AC_SUBST(HPI_FILE3,$LIB_PATH/librdhpi.la)
AC_SUBST(HPI_FILE4,$LIB_PATH/librdhpi.so)
AC_SUBST(HPI_FILE1,${libdir}/librdhpi-$VERSION.so)
AC_SUBST(HPI_FILE2,${libdir}/librdhpi.a)
AC_SUBST(HPI_FILE3,${libdir}/librdhpi.la)
AC_SUBST(HPI_FILE4,${libdir}/librdhpi.so)
else
AC_SUBST(LIBHPI,"")
AC_SUBST(HPI_FILE1,"")