diff -urN mythtv-0.19.orig/configure mythtv-0.19/configure --- mythtv-0.19.orig/configure 2006-02-09 15:14:44.000000000 +0000 +++ mythtv-0.19/configure 2006-03-14 13:12:41.000000000 +0000 @@ -21,6 +21,7 @@ compile_type="release" prefix="/usr/local" libdir="" +libdir_name="lib" mandir="" bindir="" cross_prefix="" @@ -96,6 +97,7 @@ echo " --compile-type=CTYPE one of release, profile, debug [$compile_type]" echo " NOTE: profile is for sampling profilers" echo " --prefix=PREFIX install in PREFIX [$prefix]" +echo " --libdir-name=LIBNAME search/install libraries in PREFIX/LIBNAME [$libdir_name]" #echo " --libdir=DIR install libs in DIR [PREFIX/lib]" #echo " --mandir=DIR man documentation in DIR [PREFIX/man]" echo " --disable-ccache disable compiler cache (ccache)" @@ -606,6 +608,8 @@ ;; --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`; force_prefix=yes ;; + --libdir-name=*) libdir_name=`echo $opt | cut -d '=' -f 2`; + ;; --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`; force_prefix=yes ;; --mandir=*) mandir=`echo $opt | cut -d '=' -f 2` @@ -889,7 +893,7 @@ done fi - LIBPATHS="`echo $LIBPATHS /lib /usr/lib /usr/local/lib /usr/X11R6/lib | sed s/'\/ '/' '/g` " + LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " HAS_IT="no" for LIBPATH in $LIBPATHS ; do @@ -904,7 +908,7 @@ { HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include" INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g` - HPATHS="$HPATHS `echo $INCL | sed s/lib/include/g` " + HPATHS="$HPATHS `echo $INCL | sed s/$libdir_name/include/g` " HAS_IT="no" for HPATH in $HPATHS ; do @@ -1918,7 +1922,7 @@ fi if test x"$libdir" = x""; then -libdir="${prefix}/lib" +libdir="${prefix}/${libdir_name}" fi if test x"$mandir" = x""; then @@ -2235,7 +2239,7 @@ echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH echo "PREFIX=$prefix" >> $MYTH_CONFIG_MAK -#echo "libdir=$libdir" >> $MYTH_CONFIG_MAK +echo "LIBDIR=$libdir" >> $MYTH_CONFIG_MAK #echo "bindir=$bindir" >> $MYTH_CONFIG_MAK #echo "mandir=$mandir" >> $MYTH_CONFIG_MAK #echo "MAKE=$make" >> $MYTH_CONFIG_MAK diff -urN mythtv-0.19.orig/filters/filter-common.pro mythtv-0.19/filters/filter-common.pro --- mythtv-0.19.orig/filters/filter-common.pro 2005-07-13 22:35:02.000000000 +0100 +++ mythtv-0.19/filters/filter-common.pro 2006-03-14 13:12:41.000000000 +0000 @@ -4,7 +4,7 @@ TEMPLATE = lib CONFIG -= moc qt CONFIG += plugin thread -target.path = $${PREFIX}/lib/mythtv/filters +target.path = $${LIBDIR}/mythtv/filters INSTALLS = target QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes diff -urN mythtv-0.19.orig/libs/libavcodec/libavcodec.pro mythtv-0.19/libs/libavcodec/libavcodec.pro --- mythtv-0.19.orig/libs/libavcodec/libavcodec.pro 2006-01-16 07:14:43.000000000 +0000 +++ mythtv-0.19/libs/libavcodec/libavcodec.pro 2006-03-14 13:12:41.000000000 +0000 @@ -4,7 +4,7 @@ TEMPLATE = lib TARGET = mythavcodec-$$LIBVERSION CONFIG += thread dll warn_off -target.path = $${PREFIX}/lib +target.path = $${LIBDIR} INSTALLS = target INCLUDEPATH = ../ ../../ ../libavutil diff -urN mythtv-0.19.orig/libs/libavformat/libavformat.pro mythtv-0.19/libs/libavformat/libavformat.pro --- mythtv-0.19.orig/libs/libavformat/libavformat.pro 2005-12-09 03:35:28.000000000 +0000 +++ mythtv-0.19/libs/libavformat/libavformat.pro 2006-03-14 13:12:41.000000000 +0000 @@ -4,7 +4,7 @@ TEMPLATE = lib TARGET = mythavformat-$$LIBVERSION CONFIG += thread dll warn_off -target.path = $${PREFIX}/lib +target.path = $${LIBDIR} INSTALLS = target INCLUDEPATH += ../ ../../ ../libavcodec ../libavutil ../libmythtv diff -urN mythtv-0.19.orig/libs/libavutil/libavutil.pro mythtv-0.19/libs/libavutil/libavutil.pro --- mythtv-0.19.orig/libs/libavutil/libavutil.pro 2005-12-09 03:35:28.000000000 +0000 +++ mythtv-0.19/libs/libavutil/libavutil.pro 2006-03-14 13:12:41.000000000 +0000 @@ -5,7 +5,7 @@ TARGET = mythavutil-$$LIBVERSION CONFIG += thread dll warn_off CONFIG -= qt -target.path = $${PREFIX}/lib +target.path = $${LIBDIR} INSTALLS = target INCLUDEPATH = ../ ../../ diff -urN mythtv-0.19.orig/libs/libmyth/libmyth.pro mythtv-0.19/libs/libmyth/libmyth.pro --- mythtv-0.19.orig/libs/libmyth/libmyth.pro 2005-12-09 03:35:28.000000000 +0000 +++ mythtv-0.19/libs/libmyth/libmyth.pro 2006-03-14 13:12:41.000000000 +0000 @@ -4,7 +4,7 @@ TEMPLATE = lib TARGET = myth-$$LIBVERSION CONFIG += thread dll -target.path = $${PREFIX}/lib +target.path = $${LIBDIR} INSTALLS = target QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2) diff -urN mythtv-0.19.orig/libs/libmyth/mythcontext.cpp mythtv-0.19/libs/libmyth/mythcontext.cpp --- mythtv-0.19.orig/libs/libmyth/mythcontext.cpp 2006-01-25 10:22:57.000000000 +0000 +++ mythtv-0.19/libs/libmyth/mythcontext.cpp 2006-03-14 13:12:41.000000000 +0000 @@ -186,6 +186,7 @@ Settings *m_qtThemeSettings; QString m_installprefix; + QString m_installlibdir; bool m_gui; bool m_backend; @@ -258,7 +259,7 @@ MythContextPrivate::MythContextPrivate(MythContext *lparent) : parent(lparent), m_settings(new Settings()), m_qtThemeSettings(new Settings()), - m_installprefix(PREFIX), + m_installprefix(PREFIX), m_installlibdir(LIBDIR), m_gui(false), m_backend(false), m_themeloaded(false), m_menuthemepathname(QString::null), m_themepathname(QString::null), m_backgroundimage(NULL), @@ -1120,7 +1121,7 @@ QString MythContext::GetLibraryDir(void) { - return d->m_installprefix + "/lib/mythtv/"; + return d->m_installlibdir + "/mythtv/"; } QString MythContext::GetThemesParentDir(void) diff -urN mythtv-0.19.orig/libs/libmythmpeg2/libmythmpeg2.pro mythtv-0.19/libs/libmythmpeg2/libmythmpeg2.pro --- mythtv-0.19.orig/libs/libmythmpeg2/libmythmpeg2.pro 2005-12-09 03:35:28.000000000 +0000 +++ mythtv-0.19/libs/libmythmpeg2/libmythmpeg2.pro 2006-03-14 13:12:41.000000000 +0000 @@ -4,8 +4,6 @@ TEMPLATE = lib TARGET = mythmpeg2-$$LIBVERSION CONFIG += thread staticlib warn_off -target.path = $${PREFIX}/lib -INSTALLS = target QMAKE_CFLAGS_RELEASE += -DPIC -fPIC -fno-common QMAKE_CFLAGS_DEBUG += -DPIC -fPIC -fno-common diff -urN mythtv-0.19.orig/libs/libmythsamplerate/libmythsamplerate.pro mythtv-0.19/libs/libmythsamplerate/libmythsamplerate.pro --- mythtv-0.19.orig/libs/libmythsamplerate/libmythsamplerate.pro 2005-12-09 03:35:28.000000000 +0000 +++ mythtv-0.19/libs/libmythsamplerate/libmythsamplerate.pro 2006-03-14 13:12:41.000000000 +0000 @@ -4,8 +4,6 @@ TEMPLATE = lib TARGET = mythsamplerate-$$LIBVERSION CONFIG += thread staticlib warn_off -target.path = $${PREFIX}/lib -INSTALLS = target INCLUDEPATH += ../../ diff -urN mythtv-0.19.orig/libs/libmythsoundtouch/libmythsoundtouch.pro mythtv-0.19/libs/libmythsoundtouch/libmythsoundtouch.pro --- mythtv-0.19.orig/libs/libmythsoundtouch/libmythsoundtouch.pro 2005-12-09 03:35:28.000000000 +0000 +++ mythtv-0.19/libs/libmythsoundtouch/libmythsoundtouch.pro 2006-03-14 13:12:41.000000000 +0000 @@ -4,8 +4,6 @@ TEMPLATE = lib TARGET = mythsoundtouch-$$LIBVERSION CONFIG += thread staticlib warn_off -target.path = $${PREFIX}/lib -INSTALLS = target INCLUDEPATH += ../../libs/libavcodec ../.. diff -urN mythtv-0.19.orig/libs/libmythtv/libmythtv.pro mythtv-0.19/libs/libmythtv/libmythtv.pro --- mythtv-0.19.orig/libs/libmythtv/libmythtv.pro 2006-01-13 08:11:45.000000000 +0000 +++ mythtv-0.19/libs/libmythtv/libmythtv.pro 2006-03-14 13:12:41.000000000 +0000 @@ -4,7 +4,7 @@ TEMPLATE = lib TARGET = mythtv-$$LIBVERSION CONFIG += thread dll -target.path = $${PREFIX}/lib +target.path = $${LIBDIR} INSTALLS = target INCLUDEPATH += ../.. .. diff -urN mythtv-0.19.orig/libs/libmythui/libmythui.pro mythtv-0.19/libs/libmythui/libmythui.pro --- mythtv-0.19.orig/libs/libmythui/libmythui.pro 2006-01-10 06:09:06.000000000 +0000 +++ mythtv-0.19/libs/libmythui/libmythui.pro 2006-03-14 13:12:41.000000000 +0000 @@ -4,7 +4,7 @@ TEMPLATE = lib TARGET = mythui-$$LIBVERSION CONFIG += debug thread dll -target.path = $${PREFIX}/lib +target.path = $${LIBDIR} INSTALLS = target INCLUDEPATH += ../libmyth diff -urN mythtv-0.19.orig/settings.pro mythtv-0.19/settings.pro --- mythtv-0.19.orig/settings.pro 2006-01-11 14:40:52.000000000 +0000 +++ mythtv-0.19/settings.pro 2006-03-14 13:12:41.000000000 +0000 @@ -56,6 +56,7 @@ DEFINES += _GNU_SOURCE DEFINES += _FILE_OFFSET_BITS=64 DEFINES += PREFIX=\"$${PREFIX}\" +DEFINES += LIBDIR=\"$${LIBDIR}\" # construct linking path