Magellan Linux

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

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

revision 21142 by niro, Wed Mar 12 16:40:33 2014 UTC revision 21143 by niro, Wed Mar 12 16:50:25 2014 UTC
# Line 1  Line 1 
1  # $Id$  # $Id$
2    
3  sminclude mtools cmake qt4  sminclude mtools cmake qt4 dbus
4  msetfeature "!check" # no check target in Makefile  msetfeature "!check" # no check target in Makefile
5    
6  ## some global vars ##  ## some global vars ##
7  export KDEDIR=/usr  export KDEDIR=/usr
8  export KDECONFDIR=/etc/kde4  export KDECONFDIR=/etc/kde4
9  export QT_PLUGIN_PATH=${KDEDIR}/$(mlibdir)/kde4/plugins  export QT_PLUGIN_PATH=${KDEDIR}/$(mlibdir)/kde4/plugins
 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 101  kde4_configure() Line 100  kde4_configure()
100   # add akonadi dbus dir   # add akonadi dbus dir
101   if [[ ${PNAME/4/} = akonadi ]] || [[ ${PNAME/4/} = kdepim-runtime ]]   if [[ ${PNAME/4/} = akonadi ]] || [[ ${PNAME/4/} = kdepim-runtime ]]
102   then   then
103   configure_opts+=" -DAKONADI_DBUS_INTERFACES_DIR=${DBUS_SYSTEM_DIR}/interfaces/"   configure_opts+=" -DAKONADI_DBUS_INTERFACES_DIR=$(mget-dbus-interfaces-dir)"
104   configure_opts+=" -DAKONADI_DBUS_SERVICES_DIR=${DBUS_SYSTEM_DIR}/services/"   configure_opts+=" -DAKONADI_DBUS_SERVICES_DIR=$(mget-dbus-session-bus-services-dir)"
105   fi   fi
106    
107   # add commandline given arguments   # add commandline given arguments
# Line 119  kde4_configure() Line 118  kde4_configure()
118   -DCMAKE_INSTALL_PREFIX=${KDEDIR} \   -DCMAKE_INSTALL_PREFIX=${KDEDIR} \
119   -DSYSCONF_INSTALL_DIR=${KDECONFDIR} \   -DSYSCONF_INSTALL_DIR=${KDECONFDIR} \
120   -DLIB_INSTALL_DIR=${KDEDIR}/$(mlibdir) \   -DLIB_INSTALL_DIR=${KDEDIR}/$(mlibdir) \
121   -DDBUS_INTERFACES_INSTALL_DIR=${DBUS_SYSTEM_DIR}/interfaces/ \   -DDBUS_INTERFACES_INSTALL_DIR=$(mget-dbus-interfaces-dir) \
122   -DDBUS_SERVICES_INSTALL_DIR=${DBUS_SYSTEM_DIR}/services/ \   -DDBUS_SERVICES_INSTALL_DIR=$(mget-dbus-session-bus-services-dir) \
123   -DKDE4_DBUS_INTERFACES_DIR=${DBUS_SYSTEM_DIR}/interfaces/ \   -DKDE4_DBUS_INTERFACES_DIR=$(mget-dbus-interfaces-dir) \
124   -DKDE4_DBUS_SERVICES_DIR=${DBUS_SYSTEM_DIR}/services/ \   -DKDE4_DBUS_SERVICES_DIR=$(mget-dbus-session-bus-services-dir) \
125   -DKDE4_ENABLE_FPIE=ON \   -DKDE4_ENABLE_FPIE=ON \
126   -DKDE4_BUILD_TESTS=OFF \   -DKDE4_BUILD_TESTS=OFF \
127   -DKDE4_ENABLE_HTMLHANDBOOK=ON \   -DKDE4_ENABLE_HTMLHANDBOOK=ON \

Legend:
Removed from v.21142  
changed lines
  Added in v.21143