Magellan Linux

Diff of /trunk/core/include/kde4.sminc

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

revision 4090 by niro, Wed Nov 18 23:17:22 2009 UTC revision 4091 by niro, Wed Nov 18 23:49:28 2009 UTC
# Line 6  sminclude mtools cmake qt4 Line 6  sminclude mtools cmake qt4
6  export KDEDIR=/opt/kde4  export KDEDIR=/opt/kde4
7  export KDECONFDIR=/etc/kde4  export KDECONFDIR=/etc/kde4
8  export QT_PLUGIN_PATH=${KDEDIR}/$(mlibdir)/kde4/plugins  export QT_PLUGIN_PATH=${KDEDIR}/$(mlibdir)/kde4/plugins
9    export DBUS_SYSTEM_DIR=/usr/share/dbus-1
10    
11  # fixes some compile issues ala "kde-config: command not found"  # fixes some compile issues ala "kde-config: command not found"
12  export PATH="${KDEDIR}/bin:${PATH}"  export PATH="${KDEDIR}/bin:${PATH}"
# Line 53  kde4_configure() Line 54  kde4_configure()
54    
55  # disabled, seems to be broken atm  # disabled, seems to be broken atm
56  # # use --enable-final only on i*86  # # use --enable-final only on i*86
57  # [[ ${ARCH} = i*86 ]] && configure_opts="${configure_opts} -DKDE4_ENABLE_FINAL=ON"  # [[ ${ARCH} = i*86 ]] && configure_opts+=" -DKDE4_ENABLE_FINAL=ON"
58   configure_opts="${configure_opts} -DCMAKE_BUILD_TYPE=Release"   configure_opts+=" -DCMAKE_BUILD_TYPE=Release"
59    
60   # use full rpath on non /usr installations   # use full rpath on non /usr installations
61   [[ ${KDEDIR} != /usr ]] && configure_opts="${configure_opts} -DKDE4_USE_ALWAYS_FULL_RPATH=ON"   [[ ${KDEDIR} != /usr ]] && configure_opts+=" -DKDE4_USE_ALWAYS_FULL_RPATH=ON"
62    
63   # add akonadi dbus dir   # add akonadi dbus dir
64   if [[ ${PNAME/4/} = akonadi ]] || [[ ${PNAME/4/} = kdepim-runtime ]]   if [[ ${PNAME/4/} = akonadi ]] || [[ ${PNAME/4/} = kdepim-runtime ]]
65   then   then
66   configure_opts="${configure_opts} -DAKONADI_DBUS_INTERFACES_DIR=${PREFIX:-/usr/share/dbus-1/interfaces/}"   configure_opts+=" -DAKONADI_DBUS_INTERFACES_DIR=${DBUS_SYSTEM_DIR}/interfaces/"
67   configure_opts="${configure_opts} -DAKONADI_DBUS_SERVICES_DIR=${PREFIX:-/usr/share/dbus-1/services/}"   configure_opts+=" -DAKONADI_DBUS_SERVICES_DIR=${DBUS_SYSTEM_DIR}/services/"
68   fi   fi
69    
70   # add commandline given arguments   # add commandline given arguments
71   configure_opts="${configure_opts} $@"   configure_opts+=" $@"
72    
73   # remove build dir if exist   # remove build dir if exist
74   [[ -d ${BUILDDIR}/build ]] && rm -rf ${BUILDDIR}/build   [[ -d ${BUILDDIR}/build ]] && rm -rf ${BUILDDIR}/build
# Line 77  kde4_configure() Line 78  kde4_configure()
78   cd ${BUILDDIR}/build   cd ${BUILDDIR}/build
79    
80   cmake_configure \   cmake_configure \
81   -DCMAKE_INSTALL_PREFIX=${PREFIX:-${KDEDIR}} \   -DCMAKE_INSTALL_PREFIX=${KDEDIR} \
82   -DSYSCONF_INSTALL_DIR=${PREFIX:-${KDECONFDIR}} \   -DSYSCONF_INSTALL_DIR=${KDECONFDIR} \
83   -DLIB_INSTALL_DIR=${PREFIX:-${KDEDIR}/$(mlibdir)} \   -DLIB_INSTALL_DIR=${KDEDIR}/$(mlibdir) \
84   -DKDE4_DBUS_INTERFACES_DIR=${PREFIX:-"/usr/share/dbus-1/interfaces/"} \   -DDBUS_INTERFACES_INSTALL_DIR=${DBUS_SYSTEM_DIR}/interfaces/ \
85   -DKDE4_DBUS_SERVICES_DIR=${PREFIX:-"/usr/share/dbus-1/services/"} \   -DDBUS_SERVICES_INSTALL_DIR=${DBUS_SYSTEM_DIR}/services/ \
86     -DKDE4_DBUS_INTERFACES_DIR=${DBUS_SYSTEM_DIR}/interfaces/ \
87     -DKDE4_DBUS_SERVICES_DIR=${DBUS_SYSTEM_DIR}/services/ \
88   -DKDE4_ENABLE_FPIE=ON \   -DKDE4_ENABLE_FPIE=ON \
89   -DKDE4_BUILD_TESTS=OFF \   -DKDE4_BUILD_TESTS=OFF \
90   -DKDE4_ENABLE_HTMLHANDBOOK=ON \   -DKDE4_ENABLE_HTMLHANDBOOK=ON \
# Line 107  kde4_src_install() Line 110  kde4_src_install()
110   cd ${BUILDDIR}/build   cd ${BUILDDIR}/build
111   mmake DESTDIR=${BINDIR} ${KDE4_MAKE_OPTS} install || die   mmake DESTDIR=${BINDIR} ${KDE4_MAKE_OPTS} install || die
112    
113  # # move dbus service dirs to a proper location if KDEDIR != /usr   # move dbus service dirs to a proper location if KDEDIR != /usr
114  # if [[ ${KDEDIR} != /usr ]]   if [[ ${KDEDIR} != /usr ]]
115  # then   then
116  # if [[ -d ${BINDIR}/${KDEDIR}/share/dbus-1 ]]   if [[ -d ${BINDIR}/${KDEDIR}/share/dbus-1 ]]
117  # then   then
118  # minstalldir /usr/share || die   echo -e "${COLYELLOW}Warning: using dbus hotfix, dbus locations should be fixed!${COLDEFAULT}"
119  # mv ${BINDIR}/${KDEDIR}/share/dbus-1 ${BINDIR}/usr/share/ || die   minstalldir /usr/share || die
120  # fi   cp -R ${BINDIR}/${KDEDIR}/share/dbus-1 ${BINDIR}/usr/share/ || die
121  # fi   rm -r ${BINDIR}/${KDEDIR}/share/dbus-1 || die
122     fi
123     fi
124    
125   cd ${SRCDIR}   cd ${SRCDIR}
126   local i   local i

Legend:
Removed from v.4090  
changed lines
  Added in v.4091