Ticket #1198: mythplugins_configure.2.diff

File mythplugins_configure.2.diff, 7.1 KB (added by mythtv@…, 15 years ago)

A full patch to support lib64 libdir names (remains optional)

  • mythdvd/mythdvd/mythdvd.pro

     
    99TEMPLATE = lib
    1010CONFIG += plugin thread
    1111TARGET = mythdvd
    12 target.path = $${PREFIX}/lib/mythtv/plugins
     12target.path = $${PREFIX}/$${LIBDIR_NAME}/mythtv/plugins
    1313INSTALLS += target
    1414
    1515installfiles.path = $${PREFIX}/share/mythtv
  • configure

     
    88#
    99
    1010prefix="/usr/local"
     11libdir_name="lib"
    1112
    1213music="yes"
    1314video="yes"
     
    5152NB:      all --enable-* options can be reversed with --disable-*
    5253
    5354Generic options:
    54   --prefix=PREFIX          MythTV install location PREFIX [$prefix]"
     55  --prefix=PREFIX          MythTV install location PREFIX [$prefix]
     56  --libdir-name=LIBNAME    Install libs in PREFIX/LIBNAME [$libdir_name]
    5557  --help                   print this message
    5658  --enable-all             Enable all options
    5759  --enable-opengl          enable OpenGL (Music and Gallery) [$opengl]
     
    129131  case "$opt" in
    130132  --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
    131133  ;;
     134  --libdir-name=*) libdir_name=`echo $opt | cut -d '=' -f 2`;
     135  ;;
    132136  --enable-mythmusic) music="yes"
    133137  ;;
    134138  --disable-mythmusic) music="no"
     
    287291        done
    288292    fi
    289293
    290     LIBPATHS="`echo $LIBPATHS $prefix/lib /lib /usr/lib /usr/local/lib /usr/X11R6/lib | sed s/'\/ '/' '/g` "
     294    LIBPATHS="`echo $LIBPATHS $prefix/$libdir_name /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
    291295
    292296    HAS_IT="no"
    293297    for LIBPATH in $LIBPATHS ; do
     
    302306{
    303307    HPATHS="$prefix/include /usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include /"
    304308    INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
    305     HPATHS="$HPATHS `echo $INCL | sed s/lib/include/g` "
     309    HPATHS="$HPATHS `echo $INCL | sed s,$libdir_name,include,g` "
    306310
    307311    HAS_IT="no"
    308312    for HPATH in $HPATHS ; do
  • mythmusic/mythmusic/mythmusic.pro

     
    1010TEMPLATE = lib
    1111CONFIG += plugin thread
    1212TARGET = mythmusic
    13 target.path = $${PREFIX}/lib/mythtv/plugins
     13target.path = $${PREFIX}/$${LIBDIR_NAME}/mythtv/plugins
    1414INSTALLS += target
    1515
    1616installfiles.path = $${PREFIX}/share/mythtv
  • mythbrowser/mythbookmarkmanager/mythbookmarkmanager.pro

     
    77TEMPLATE = lib
    88CONFIG += plugin thread warn_on debug
    99TARGET = mythbookmarkmanager
    10 target.path = $${PREFIX}/lib/mythtv/plugins
     10target.path = $${PREFIX}/$${LIBDIR_NAME}/mythtv/plugins
    1111INSTALLS += target
    1212
    1313#uifiles.path = $${PREFIX}/share/mythtv/themes/default
  • settings.pro

     
    1212
    1313DEFINES += _GNU_SOURCE
    1414DEFINES += PREFIX=\"$${PREFIX}\"
     15DEFINES += LIBDIR_NAME=\"$${LIBDIR_NAME}\"
    1516
    1617INCLUDEPATH += $${PREFIX}/include
    1718INCLUDEPATH += $$CONFIG_INCLUDEPATH
  • mythweather/mythweather/mythweather.pro

     
    44TEMPLATE = lib
    55CONFIG += plugin thread
    66TARGET = mythweather
    7 target.path = $${PREFIX}/lib/mythtv/plugins
     7target.path = $${PREFIX}/$${LIBDIR_NAME}/mythtv/plugins
    88INSTALLS += target
    99
    1010uifiles.path = $${PREFIX}/share/mythtv/themes/default
  • mythgallery/mythgallery/mythgallery.pro

     
    1010TEMPLATE = lib
    1111CONFIG += plugin thread
    1212TARGET = mythgallery
    13 target.path = $${PREFIX}/lib/mythtv/plugins
     13target.path = $${PREFIX}/$${LIBDIR_NAME}/mythtv/plugins
    1414INSTALLS += target
    1515LIBS += -ltiff
    1616
  • mythflix/mythflix/mythflix.pro

     
    44TEMPLATE = lib
    55CONFIG += plugin thread warn_on debug
    66TARGET = mythflix
    7 target.path = $${PREFIX}/lib/mythtv/plugins
     7target.path = $${PREFIX}/$${LIBDIR_NAME}/mythtv/plugins
    88INSTALLS += target
    99
    1010uifiles.path = $${PREFIX}/share/mythtv/themes/default
  • mythcontrols/mythcontrols/mythcontrols.pro

     
    44TEMPLATE = lib
    55CONFIG += plugin thread
    66TARGET = mythcontrols
    7 target.path = $${PREFIX}/lib/mythtv/plugins
     7target.path = $${PREFIX}/$${LIBDIR_NAME}/mythtv/plugins
    88INSTALLS += target
    99
    1010uifiles.path = $${PREFIX}/share/mythtv/themes/default
  • mythvideo/mythvideo/mythvideo.pro

     
    44TEMPLATE = lib
    55CONFIG += plugin thread
    66TARGET = mythvideo
    7 target.path = $${PREFIX}/lib/mythtv/plugins
     7target.path = $${PREFIX}/$${LIBDIR_NAME}/mythtv/plugins
    88INSTALLS += target
    99
    1010uifiles.path = $${PREFIX}/share/mythtv/themes/default
  • mythgame/mythgame/mythgame.pro

     
    44TEMPLATE = lib
    55CONFIG += plugin thread
    66TARGET = mythgame
    7 target.path = $${PREFIX}/lib/mythtv/plugins
     7target.path = $${PREFIX}/$${LIBDIR_NAME}/mythtv/plugins
    88INSTALLS += target
    99
    1010installfiles.path = $${PREFIX}/share/mythtv
  • mythphone/mythphone/mythphone.pro

     
    1616TEMPLATE = lib
    1717CONFIG += plugin thread
    1818TARGET = mythphone
    19 target.path = $${PREFIX}/lib/mythtv/plugins
     19target.path = $${PREFIX}/$${LIBDIR_NAME}/mythtv/plugins
    2020INSTALLS += target
    2121
    2222uifiles.path = $${PREFIX}/share/mythtv/themes/default
  • mythnews/mythnews/mythnews.pro

     
    44TEMPLATE = lib
    55CONFIG += plugin thread warn_on debug
    66TARGET = mythnews
    7 target.path = $${PREFIX}/lib/mythtv/plugins
     7target.path = $${PREFIX}/$${LIBDIR_NAME}/mythtv/plugins
    88INSTALLS += target
    99
    1010uifiles.path = $${PREFIX}/share/mythtv/themes/default