--- db/prgsrc/Makefile	2003/01/09 01:43:21	1.34
+++ db/prgsrc/Makefile	2003/01/09 13:47:22	1.37
@@ -19,11 +19,11 @@ INDEXWRITER= rubash@hotbox.ru, roma7@zab
 AUTHORCHECKER = roma7@zaba.ru
 #AUTHORCHECKER = boris
 DELIVERER = roma7@zaba.ru, boris
-DELIVERER = boris
+#DELIVERER = boris
 UPDATELOG = $(DUMPDIR)/update.log
 UAUTHORS=$(DUMPDIR)/uauthors
 UNSORTED=$(DUMPDIR)/unsorted
-
+RSPARAMS= 2000 50
 
 DBSCRIPTS = mkdb.pl \
 	    updatem.pl \
@@ -165,22 +165,23 @@ dbdeliver:
 	gzip $(DUMPDIR)/chgkdump
 	rm $(DUMPDIR)/chgkdump.0
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
+	mail -s"Database delivered" $(DELIVERER)
 
 update: 
 	cvs update $(SRCDIR)
 	mysql -upiataev chgk <delq.sql
-	${PERL} $(DBBIN)/mkdb.pl
-	${PERL} $(DBBIN)/updateindex.pl -i$(SRCDIR)/index
-	${PERL} $(DBBIN)/updatedb.pl $(SRCDIR)/*.txt 2>&1 | tee $(UPDATELOG)
-	${PERL} $(DBBIN)/makeauthors.pl
+	$(DBBIN)/mkdb.pl
+	$(DBBIN)/updateindex.pl -i$(SRCDIR)/index
+	$(DBBIN)/updatedb.pl $(SRCDIR)/*.txt 2>&1 | tee $(UPDATELOG)
+	$(DBBIN)/makeauthors.pl
 	if [ -s $(UAUTHORS) ]; then  \
 		mail -sUauthors $(AUTHORCHECKER) < $(UAUTHORS); \
 	fi
 	if [ -s $(UNSORTED) ]; then \
 		mail -sUnsorted $(INDEXWRITER) <$(UNSORTED);\
 	 else \
-		 $(PERL) $(DBBIN)/mkRS.pl; \
-		$(PERL) $(DBBIN)/updateRS2.pl 2000 50;\
+		$(DBBIN)/mkRS.pl; \
+		$(DBBIN)/updateRS2.pl $(RSPARAMS);\
 		mail -s"Ready to deliver" $(DELIVERER);\
 	 fi