fix #1 #2 #3

sdfg2 · Jul 20, 2014 · 81c2700 · 81c2700
1 parent 69b4421
commit 81c2700
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/net-im/ejabberd/ejabberd-9999.ebuild b/net-im/ejabberd/ejabberd-9999.ebuild
@@ -72,7 +72,7 @@ src_prepare() {
 
 	# correct path to captcha script in default ejabberd.cfg
 #	sed -e 's|\(captcha_cmd: "\)".*"|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sha"}|' \
-	sed -e 's|.*\(captcha_cmd: \).*|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sha"|' \
+	sed -e 's|.*\(captcha_cmd: \).*|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"|' \
 			-i ejabberd.yml.example || die "Failed sed ejabberd.yml.example"
 	eaclocal
 	eautoconf
@@ -91,7 +91,7 @@ src_configure() {
 		$(use_enable nif) \
 		$(use_enable odbc) \
 		$(use_enable mysql) \
-		$(use_enable pgsql) \
+		$(use_enable pgsql postgres) \
 		$(use_enable pam) \
 		$(use_enable zlib) \
 		$(use_enable stun) \
@@ -120,6 +120,8 @@ src_install() {
 	cd "${WORKDIR}/${P}/doc"
 	dodoc release_notes_*.txt
 
+	cp -R "${WORKDIR}/${P}/sql" "/usr/share/ejabberd"
+
 	#dodir /var/lib/ejabberd
 	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}-3.confd" ${PN}