Magellan Linux

  • Back to homepage
    • /[smage]/branches/R11-unstable/include/kde4.sminc

    Diff of /branches/R11-unstable/include/kde4.sminc

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 4083 by niro, Wed Nov 18 20:09:50 2009 UTC revision 4090 by niro, Wed Nov 18 23:17:22 2009 UTC
    # Line 59  kde4_configure() Line 59  kde4_configure()
    59   # use full rpath on non /usr installations   # use full rpath on non /usr installations
    60   [[ ${KDEDIR} != /usr ]] && configure_opts="${configure_opts} -DKDE4_USE_ALWAYS_FULL_RPATH=ON"   [[ ${KDEDIR} != /usr ]] && configure_opts="${configure_opts} -DKDE4_USE_ALWAYS_FULL_RPATH=ON"
    61    
    62     # add akonadi dbus dir
    63     if [[ ${PNAME/4/} = akonadi ]] || [[ ${PNAME/4/} = kdepim-runtime ]]
    64     then
    65     configure_opts="${configure_opts} -DAKONADI_DBUS_INTERFACES_DIR=${PREFIX:-/usr/share/dbus-1/interfaces/}"
    66     configure_opts="${configure_opts} -DAKONADI_DBUS_SERVICES_DIR=${PREFIX:-/usr/share/dbus-1/services/}"
    67     fi
    68    
    69   # add commandline given arguments   # add commandline given arguments
    70   configure_opts="${configure_opts} $@"   configure_opts="${configure_opts} $@"
    71    
    # Line 100  kde4_src_install() Line 107  kde4_src_install()
    107   cd ${BUILDDIR}/build   cd ${BUILDDIR}/build
    108   mmake DESTDIR=${BINDIR} ${KDE4_MAKE_OPTS} install || die   mmake DESTDIR=${BINDIR} ${KDE4_MAKE_OPTS} install || die
    109    
    110    # # move dbus service dirs to a proper location if KDEDIR != /usr
    111    # if [[ ${KDEDIR} != /usr ]]
    112    # then
    113    # if [[ -d ${BINDIR}/${KDEDIR}/share/dbus-1 ]]
    114    # then
    115    # minstalldir /usr/share || die
    116    # mv ${BINDIR}/${KDEDIR}/share/dbus-1 ${BINDIR}/usr/share/ || die
    117    # fi
    118    # fi
    119    
    120   cd ${SRCDIR}   cd ${SRCDIR}
    121   local i   local i
    122   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
    Legend:
    Removed from v.4083  
    changed lines
      Added in v.4090