Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 416217 | Differences between
and this patch

Collapse All | Expand All

(-)cups-1.5.2-r21.ebuild.old (-7 / +12 lines)
Lines 178-194 src_configure() { Link Here
178
	fi
178
	fi
179
179
180
	econf \
180
	econf \
181
		--libdir=/usr/$(get_libdir) \
181
		--libdir="${EPREFIX}"/usr/$(get_libdir) \
182
		--localstatedir=/var \
182
		--libexecdir="${EPREFIX}"/usr/libexec \
183
		--localstatedir="${EPREFIX}"/var \
183
		--with-cups-user=lp \
184
		--with-cups-user=lp \
184
		--with-cups-group=lp \
185
		--with-cups-group=lp \
185
		--with-docdir=/usr/share/cups/html \
186
		--with-docdir="${EPREFIX}"/usr/share/cups/html \
187
		--with-icondir="${EPREFIX}"/usr/share/icon \
186
		--with-languages="${LINGUAS}" \
188
		--with-languages="${LINGUAS}" \
187
		--with-pdftops=/usr/bin/pdftops \
189
		--with-menudir="${EPREFIX}"/usr/share/menu \
190
		--with-pdftops="${EPREFIX}"/usr/bin/pdftops \
191
		--with-rcdir="${EPREFIX}"/etc \
188
		--with-system-groups=lpadmin \
192
		--with-system-groups=lpadmin \
189
		$(use_enable acl) \
193
		$(use_enable acl) \
190
		$(use_enable avahi) \
194
		$(use_enable avahi) \
191
		$(use_enable dbus) \
195
		$(use_enable dbus) \
196
		--with-dbusdir=$(use dbus && echo "${EPREFIX}"/etc/dbus || echo "") \
192
		$(use_enable debug) \
197
		$(use_enable debug) \
193
		$(use_enable debug debug-guards) \
198
		$(use_enable debug debug-guards) \
194
		$(use_enable jpeg) \
199
		$(use_enable jpeg) \
Lines 213-221 src_configure() { Link Here
213
218
214
	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
219
	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
215
	# makes more sense when facing multilib support.
220
	# makes more sense when facing multilib support.
216
	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die
221
	sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)${EPREFIX}"/usr/libexec/cups:' Makedefs || die
217
	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
222
	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "${EPREFIX}/usr/libexec/cups":' config.h || die
218
	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
223
	sed -i -e 's:cups_serverbin=.*:cups_serverbin=${EPREFIX}/usr/libexec/cups:' cups-config || die
219
}
224
}
220
225
221
src_compile() {
226
src_compile() {

Return to bug 416217