Magellan Linux

Diff of /branches/R11-stable/include/kde4-split-2.sminc

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

revision 12340 by niro, Wed May 16 20:19:14 2012 UTC revision 17613 by niro, Sun Jun 23 13:01:46 2013 UTC
# Line 13  kde4-split_src_install_wrapper() Line 13  kde4-split_src_install_wrapper()
13  {  {
14   local KDEMODULE="$1"   local KDEMODULE="$1"
15    
16   # fix modulename kdesdk4-kate -> kate  # # fix modulename kdesdk4-kate -> kate
17   [[ ${KDEMODULE/${SPLIT_PACKAGE_BASE}-/} != ${KDEMODULE} ]] && KDEMODULE="${KDEMODULE/${SPLIT_PACKAGE_BASE}-/}"  # [[ ${KDEMODULE/${SPLIT_PACKAGE_BASE}-/} != ${KDEMODULE} ]] && KDEMODULE="${KDEMODULE/${SPLIT_PACKAGE_BASE}-/}"
18    
19   cd ${BUILDDIR}/build   cd ${BUILDDIR}/build
20    
# Line 38  kde4-split_src_install_wrapper() Line 38  kde4-split_src_install_wrapper()
38   rm -r ${BINDIR}/${KDEDIR}/share/dbus-1 || die   rm -r ${BINDIR}/${KDEDIR}/share/dbus-1 || die
39   fi   fi
40   fi   fi
41     # or if KDECONFDIR != /etc
42     if [[ ${KDECONFDIR} != /etc ]]
43     then
44     if [[ -d ${BINDIR}/${KDECONFDIR}/dbus-1 ]]
45     then
46     echo -e "${COLYELLOW}Warning: using dbus hotfix, dbus locations should be fixed!${COLDEFAULT}"
47     minstalldir /etc || die
48     cp -R ${BINDIR}/${KDECONFDIR}/dbus-1 ${BINDIR}/etc/ || die
49     rm -r ${BINDIR}/${KDECONFDIR}/dbus-1 || die
50     fi
51     fi
52    
53   cd ${SRCDIR}   cd ${SRCDIR}
54   local i   local i

Legend:
Removed from v.12340  
changed lines
  Added in v.17613