X-Git-Url: https://pd.if.org/git/?p=newsd;a=blobdiff_plain;f=Makefile;h=7102ea4d19cac11c0aa497201fc9ed2b8ff78af8;hp=306b50b921260835beac1e030221e5c54da91d57;hb=HEAD;hpb=5c9fea27af804cd4afeea4a705ad23db8bc5b16e

diff --git a/Makefile b/Makefile
index 306b50b..7102ea4 100644
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,8 @@ control.ctl:
 newsdb:
 	-dropdb news
 	createdb -O news -T template0 -E SQL_ASCII news
-	psql -d news -c 'alter database news set search_path to nntp,public'
-	psql -d news -c 'alter database news set client_min_messages to warning'
+	$(PSQL) -c 'alter database news set search_path to nntp,public'
+	$(PSQL) -c 'alter database news set client_min_messages to warning'
 
 preserve:
 	sudo su -c 'psql -1 --set ON_ERROR_STOP=1 -U news -d news -f preserve.sql' news
@@ -44,7 +44,7 @@ testserver:
 test:
 	-test -f newsd.pid && kill `cat newsd.pid`
 	rm -f news.log
-	PERL5LIB=./Net-Server-NNTP/lib ./newsd conf_file=test.conf
+	PERL5LIB=./Net-Server-NNTP/lib ./newsd conf_file=t/test.conf
 	sleep 1
 	-prove t/*.t
 	-test -f newsd.pid && kill `cat newsd.pid`
@@ -52,7 +52,7 @@ test:
 vtest:
 	-test -f newsd.pid && kill `cat newsd.pid`
 	rm -f news.log
-	PERL5LIB=./Net-Server-NNTP/lib ./newsd conf_file=test.conf
+	PERL5LIB=./Net-Server-NNTP/lib ./newsd conf_file=t/test.conf
 	sleep 1
 	-prove -v t/*.t
 	-test -f newsd.pid && kill `cat newsd.pid`