/[gentoo-x86]/eclass/gnome2.eclass
Gentoo

Diff of /eclass/gnome2.eclass

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

Revision 1.30 Revision 1.33
1# Copyright 1999-2003 Gentoo Technologies, Inc. 1# Copyright 1999-2003 Gentoo Technologies, Inc.
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.30 2003/04/15 10:23:40 liquidx Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.33 2003/05/04 18:58:55 liquidx Exp $
4# 4#
5# Authors: 5# Authors:
6# Bruce A. Locke <blocke@shivan.org> 6# Bruce A. Locke <blocke@shivan.org>
7# Spidler <spidler@gentoo.org> 7# Spidler <spidler@gentoo.org>
8 8
50 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" 50 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
51 51
52 if [ -z "${USE_DESTDIR}" -o "${USE_DESTDIR}" = "0" ]; then 52 if [ -z "${USE_DESTDIR}" -o "${USE_DESTDIR}" = "0" ]; then
53 einstall " scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/ " ${@} 53 einstall " scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/ " ${@}
54 else 54 else
55 make DESTDIR=${D} ${@} install 55 make DESTDIR=${D} \
56 scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper \
57 ${@} install
56 fi 58 fi
57 59
58 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL 60 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
59 61
60 # manual document installation 62 # manual document installation
85 ${ROOT}/usr/bin/gconftool-2 --makefile-install-rule ${F} 87 ${ROOT}/usr/bin/gconftool-2 --makefile-install-rule ${F}
86 done 88 done
87 fi 89 fi
88} 90}
89 91
92gnome2_omf_fix() {
93 # workaround/patch against omf.make or omf-install/Makefile.in
94 # in order to remove redundant scrollkeeper-updates.
95 # - <liquidx@gentoo.org>
96
97 local omf_makefiles
98
99 omf_makefiles="$@"
100
101 [ -f ${S}/omf-install/Makefile.in ] \
102 && omf_makefiles="${omf_makefiles} ${S}/omf-install/Makefile.in"
103 [ -f ${S}/omf.make ] \
104 && omf_makefiles="${omf_makefiles} ${S}/omf.make"
105
106 for omf in ${omf_makefiles}; do
107 omfbase=$(basename ${omf})
108 einfo "Fixing OMF Makefile: ${omfbase}"
109 sed -i -e 's:\(-scrollkeeper-update -p $(localstatedir)/scrollkeeper\)\([ \t\\]*\)$:\1 -o $(DESTDIR)$(omf_dest_dir)\2:' ${omf}
110 sed -i -e 's:\(-scrollkeeper-update -p $(scrollkeeper_localstate_dir)\)\([ \t\\]*\)$:\1 -o $(DESTDIR)$(omf_dest_dir)\2:' ${omf}
111 done
112}
113
90gnome2_scrollkeeper_update() { 114gnome2_scrollkeeper_update() {
91 if [ -x ${ROOT}/usr/bin/scrollkeeper-update ] && [ "${SCROLLKEEPER_UPDATE}" = "1" ] 115 if [ -x ${ROOT}/usr/bin/scrollkeeper-update ] && [ "${SCROLLKEEPER_UPDATE}" = "1" ]
92 then 116 then
93 echo ">>> Updating Scrollkeeper" 117 echo ">>> Updating Scrollkeeper"
94 scrollkeeper-update -q -p ${ROOT}/var/lib/scrollkeeper 118 scrollkeeper-update -q -p ${ROOT}/var/lib/scrollkeeper

Legend:
Removed from v.1.30  
changed lines
  Added in v.1.33

  ViewVC Help
Powered by ViewVC 1.1.20