Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +01:00
Code Issues Projects Releases Wiki Activity

2018-08-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored the RPM spec file to combine the 'rivendell' and
	'rivendell-base' packages.
This commit is contained in:
Fred Gleason
2018-08-17 14:08:54 -04:00
parent a385a50645
commit cd65321161
4 changed files with 32 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
configure.ac
View File

@@ -117,8 +117,8 @@ if test $ar_gcc_distro = suse ; then
# AC_SUBST(CONSOLEHELPER_RDALSACONFIG,"")
AC_SUBST(USERMODE_PKG,"")
AC_SUBST(MYSQL_PKG,"mysql")
AC_SUBST(QT3_MYSQL_PKG,"qt3-mysql")
AC_SUBST(QT3_DEVEL_PKG,"qt3-devel")
AC_SUBST(QT4_MYSQL_PKG,"qt-mysql")
AC_SUBST(QT4_DEVEL_PKG,"qt-devel")
AC_SUBST(DOC_PATH,"/usr/share/doc/rivendell")
else
AC_SUBST(APACHE_PKG,"httpd")
@@ -127,21 +127,21 @@ else
if test $ar_distro_major -ge 7 ; then
AC_SUBST(USERMODE_PKG,"usermode usermode-gtk")
AC_SUBST(MYSQL_PKG,"mariadb")
AC_SUBST(QT3_MYSQL_PKG,"qt3-MySQL")
AC_SUBST(QT3_DEVEL_PKG,"qt3-devel")
AC_SUBST(QT4_MYSQL_PKG,"qt-mysql")
AC_SUBST(QT4_DEVEL_PKG,"qt-devel")
AC_SUBST(CDDA2WAV_PKG,"icedax")
else
if test $ar_distro_major -ge 6 ; then
AC_SUBST(USERMODE_PKG,"usermode")
AC_SUBST(MYSQL_PKG,"mysql")
AC_SUBST(QT3_MYSQL_PKG,"qt-MySQL")
AC_SUBST(QT3_DEVEL_PKG,"qt3-devel")
AC_SUBST(QT4_MYSQL_PKG,"qt4-mysql")
AC_SUBST(QT4_DEVEL_PKG,"qt4-devel")
AC_SUBST(CDDA2WAV_PKG,"icedax")
else
AC_SUBST(USERMODE_PKG,"usermode")
AC_SUBST(MYSQL_PKG,"mysql")
AC_SUBST(QT3_MYSQL_PKG,"qt-MySQL")
AC_SUBST(QT3_DEVEL_PKG,"qt-devel")
AC_SUBST(QT4_MYSQL_PKG,"qt-MySQL")
AC_SUBST(QT4_DEVEL_PKG,"qt-devel")
AC_SUBST(CDDA2WAV_PKG,"")
fi
fi
@@ -308,34 +308,12 @@ if test $HPI_FOUND ; then
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_FILE5,"")
AC_SUBST(HPI_FILE6,"")
AC_SUBST(HPI_FILE7,$PREFIX/share/rivendell/rdhpi_es.qm)
AC_SUBST(HPI_FILE8,$PREFIX/share/rivendell/rdhpi_cs.qm)
AC_SUBST(HPI_FILE9,$PREFIX/share/rivendell/rdhpi_de.qm)
AC_SUBST(HPI_FILE10,$PREFIX/share/rivendell/rdhpi_nn.qm)
AC_SUBST(HPI_FILE11,$PREFIX/share/rivendell/rdhpi_nb.qm)
AC_SUBST(HPI_FILE12,$PREFIX/share/rivendell/rdhpi_pt_BR.qm)
AC_SUBST(HPI_FILE13,"")
AC_SUBST(HPI_FILE14,"")
AC_SUBST(HPI_FILE15,"")
else
AC_SUBST(LIBHPI,"")
AC_SUBST(HPI_FILE1,"")
AC_SUBST(HPI_FILE2,"")
AC_SUBST(HPI_FILE3,"")
AC_SUBST(HPI_FILE4,"")
AC_SUBST(HPI_FILE5,"")
AC_SUBST(HPI_FILE6,"")
AC_SUBST(HPI_FILE7,"")
AC_SUBST(HPI_FILE8,"")
AC_SUBST(HPI_FILE9,"")
AC_SUBST(HPI_FILE10,"")
AC_SUBST(HPI_FILE11,"")
AC_SUBST(HPI_FILE12,"")
AC_SUBST(HPI_FILE13,"")
AC_SUBST(HPI_FILE14,"")
AC_SUBST(HPI_FILE15,"")
fi
else
AC_SUBST(LIBHPI,"")
@@ -343,17 +321,6 @@ else
AC_SUBST(HPI_FILE2,"")
AC_SUBST(HPI_FILE3,"")
AC_SUBST(HPI_FILE4,"")
AC_SUBST(HPI_FILE5,"")
AC_SUBST(HPI_FILE6,"")
AC_SUBST(HPI_FILE7,"")
AC_SUBST(HPI_FILE8,"")
AC_SUBST(HPI_FILE9,"")
AC_SUBST(HPI_FILE10,"")
AC_SUBST(HPI_FILE11,"")
AC_SUBST(HPI_FILE12,"")
AC_SUBST(HPI_FILE13,"")
AC_SUBST(HPI_FILE14,"")
AC_SUBST(HPI_FILE15,"")
fi
AM_CONDITIONAL([HPI_RD_AM], [test "$USING_HPI" = yes])