← Back to branch summary

~ubuntu-branches/ubuntu/karmic/cdbs/karmic

« back to all changes in this revision

Viewing changes to 1/class/kde4.mk.in

  • Committer: Bazaar Package Importer
  • Author(s): Harald Sitter
  • Date: 2009-01-18 20:21:42 UTC
  • Revision ID: james.westby@ubuntu.com-20090118202142-2m7b59bf05eb0ak0
Tags: 0.4.52ubuntu11
https://launchpad.net/bugs/284915
Change HTML_INSTALL_DIR from usr/share/doc/kde4/HTML to ..doc/kde/HTML
this enables KDE 4's KHelpcenter to use KDE 3 and KDE 4 documentation
(LP: #284915)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1/class/kde4.mk.in
18
18
        -DKDE4_USE_ALWAYS_FULL_RPATH=false \
19
19
        -DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR) \
20
20
        -DDATA_INSTALL_DIR=/usr/share/kde4/apps \
21
 
        -DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML \
 
21
        -DHTML_INSTALL_DIR=/usr/share/doc/kde/HTML \
22
22
        -DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \
23
23
        -DLIB_INSTALL_DIR=/usr/lib \
24
24
        -DSYSCONF_INSTALL_DIR=/etc
37
37
#### Default additional (custom) cmake flags ####
38
38
DEB_CMAKE_CUSTOM_FLAGS ?=
39
39
 
40
 
# Set the one below to something else than 'yes' to disable linking 
 
40
# Set the one below to something else than 'yes' to disable linking
41
41
# with --as-needed (on by default)
42
42
DEB_KDE_LINK_WITH_AS_NEEDED ?= no
43
43
ifneq (,$(findstring yes, $(DEB_KDE_LINK_WITH_AS_NEEDED)))