Attachment #249758 for bug #339945

View | Details | Raw Unified | Return to bug 339945
Collapse All | Expand All





	local MOD_FILE=$(apache_mod_file)

	exeinto "${APACHE_MODULESDIR#${EPREFIX}}"
	doexe ${MOD_FILE} || die "internal ebuild error: '${MOD_FILE}' not found"
	[[ -n "${APACHE2_EXECFILES}" ]] && doexe ${APACHE2_EXECFILES}

	if [[ -n "${APACHE2_MOD_CONF}" ]] ; then
		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
		set -- ${APACHE2_MOD_CONF}
		newins "${FILESDIR}/${1}.conf" "$(basename ${2:-$1}).conf" \
			|| die "internal ebuild error: '${FILESDIR}/${1}.conf' not found"
	fi

	if [[ -n "${APACHE2_VHOST_CONF}" ]] ; then
		insinto "${APACHE_VHOSTS_CONFDIR#${EPREFIX}}"
		set -- ${APACHE2_VHOST_CONF}
		newins "${FILESDIR}/${1}.conf" "$(basename ${2:-$1}).conf " \
			|| die "internal ebuild error: '${FILESDIR}/${1}.conf' not found"

Return to bug 339945

Lines 180-198 Link Here

(-)eclass/apache-module.eclass.old (-3 / +3 lines)
180		180
181	local MOD_FILE=$(apache_mod_file)	181	local MOD_FILE=$(apache_mod_file)
182		182
183	exeinto "${APACHE_MODULESDIR}"	183	exeinto "${APACHE_MODULESDIR#${EPREFIX}}"
184	doexe ${MOD_FILE} \|\| die "internal ebuild error: '${MOD_FILE}' not found"	184	doexe ${MOD_FILE} \|\| die "internal ebuild error: '${MOD_FILE}' not found"
185	[[ -n "${APACHE2_EXECFILES}" ]] && doexe ${APACHE2_EXECFILES}	185	[[ -n "${APACHE2_EXECFILES}" ]] && doexe ${APACHE2_EXECFILES}
186		186
187	if [[ -n "${APACHE2_MOD_CONF}" ]] ; then	187	if [[ -n "${APACHE2_MOD_CONF}" ]] ; then
188	insinto "${APACHE_MODULES_CONFDIR}"	188	insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
189	set -- ${APACHE2_MOD_CONF}	189	set -- ${APACHE2_MOD_CONF}
190	newins "${FILESDIR}/${1}.conf" "$(basename ${2:-$1}).conf" \	190	newins "${FILESDIR}/${1}.conf" "$(basename ${2:-$1}).conf" \
191	\|\| die "internal ebuild error: '${FILESDIR}/${1}.conf' not found"	191	\|\| die "internal ebuild error: '${FILESDIR}/${1}.conf' not found"
192	fi	192	fi
193		193
194	if [[ -n "${APACHE2_VHOST_CONF}" ]] ; then	194	if [[ -n "${APACHE2_VHOST_CONF}" ]] ; then
195	insinto "${APACHE_VHOSTS_CONFDIR}"	195	insinto "${APACHE_VHOSTS_CONFDIR#${EPREFIX}}"
196	set -- ${APACHE2_VHOST_CONF}	196	set -- ${APACHE2_VHOST_CONF}
197	newins "${FILESDIR}/${1}.conf" "$(basename ${2:-$1}).conf " \	197	newins "${FILESDIR}/${1}.conf" "$(basename ${2:-$1}).conf " \
198	\|\| die "internal ebuild error: '${FILESDIR}/${1}.conf' not found"	198	\|\| die "internal ebuild error: '${FILESDIR}/${1}.conf' not found"