--- db/prgsrc/Makefile	2003/01/09 01:44:05	1.35
+++ db/prgsrc/Makefile	2003/01/10 18:55:38	1.39
@@ -14,7 +14,7 @@ DESTPRGSRC=~piataev/db/prgsrc
 DUMPDIR=../dump
 DESTDUMPDIR=/var/tmp/
 TABLES= Questions Tournaments word2question nf nests Authors A2Q
-INDEXWRITER= rubash@hotbox.ru, roma7@zaba.ru
+INDEXWRITER= rubash@yandex.ru, roma7@zaba.ru
 #INDEXWRITER= boris
 AUTHORCHECKER = roma7@zaba.ru
 #AUTHORCHECKER = boris
@@ -23,7 +23,8 @@ DELIVERER = roma7@zaba.ru, boris
 UPDATELOG = $(DUMPDIR)/update.log
 UAUTHORS=$(DUMPDIR)/uauthors
 UNSORTED=$(DUMPDIR)/unsorted
-
+RSPARAMS= 2000 50
+TIMESTAMP= $(DUMPDIR)/timestamp
 
 DBSCRIPTS = mkdb.pl \
 	    updatem.pl \
@@ -71,7 +72,7 @@ HTMLS = contribute.html \
 	search.html  
 
 
-TEXTS = $(SRCDIR)/*.txt
+TEXTS = $(wildcard $(SRCDIR)/*.txt) $(SRCDIR)/index
 
 
 DBBIN = ../bin
@@ -87,6 +88,10 @@ HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR
 
 all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL)
 
+install: all
+
+test:
+	echo $(TEXTS)
 
 $(DBBIN)/%.pl:       %.pl
 	${PERL} -c $<
@@ -147,10 +152,6 @@ $(HTMLDIR)/%.html:       %.html
 	cp $< $@
 
 
-$(UNSORTED): TEXTS
-
-$(SRCDIR)/%.txt:
-	updatedb $<
 
 srcdeliver:
 	$(RSYNC) $(SRCDIR) $(KULICHKI):$(DESTSRCDIR)
@@ -165,24 +166,30 @@ dbdeliver:
 	gzip $(DUMPDIR)/chgkdump
 	rm $(DUMPDIR)/chgkdump.0
 	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
+	mail -s"Database delivered" $(DELIVERER)
 
 update: 
 	cvs update $(SRCDIR)
+	$(MAKE) $(TIMESTAMP)
+
+$(TIMESTAMP): $(TEXTS)
 	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
+	touch $(TIMESTAMP)
+
 
 authorsdeliver:
 	mysqldump --add-drop-table -u piataev chgk Authors A2Q  > $(DUMPDIR)/chgkdump.0