--- db/prgsrc/Makefile	2001/11/01 01:44:59	1.11
+++ db/prgsrc/Makefile	2002/11/11 08:51:52	1.23
@@ -7,11 +7,13 @@ PMODE = 775
 LMODE = 664
 KULICHKI=znatoki.kulichki.net
 RSYNC = rsync -ruvpte ssh --delete --progress --rsync-path='~/bin/rsync'
+SCP=scp
 DESTSRCDIR=~piataev/public_html/dimrub/src/
-SRCDIR=../baza/
+SRCDIR=../baza
 DESTPRGSRC=~piataev/db/prgsrc
 DUMPDIR=../dump
-DESTDUMPDIR=/tmp/
+DESTDUMPDIR=/var/tmp/
+TABLES= Questions Tournaments word2question nf nests
 
 DBSCRIPTS = mkdb.pl \
 	    updatem.pl \
@@ -24,8 +26,11 @@ DBSCRIPTS = mkdb.pl \
 	    renamefile.pl \
 	    makecheck.pl\
 	    mkRS.pl\
+	    delRS.pl\
 	    updateRS.pl\
 	    updateRS1.pl\
+	    updateRS2.pl\
+	    updateRS3.pl\
 	    dumpRS.pl\
 	    dumpin2out.pl\
 	    dump2dump.pl\
@@ -41,16 +46,35 @@ LIBS = chgkfiles.pm \
 
 CGISCRIPTS = db.cgi
 
+
+HTMLS = contribute.html \
+	copyright.html \
+	copyright_mozg.html \
+	credits.html \
+	dbmain.html \
+	footer.html \
+	guestbook.html \
+	index.html \
+	random.html \
+	reklama.html \
+	search.html  
+
+
+TEXTS = $(SRCDIR)/*.txt
+
+
 DBBIN = ../bin
 MANDIR = ../man
 LIBDIR = ../lib
 CGIBIN = $(ROOT)/public_html/cgi-bin
+HTMLDIR = $(ROOT)/public_html/dimrub/db
 
 BININSTALL =    ${DBSCRIPTS:%=$(DBBIN)/%}
 CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGIBIN)/%.cgi}
 LIBINSTALL =    ${LIBS:%=$(LIBDIR)/%}
+HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR)/%.html}
 
-all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) 
+all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL)
 
 
 $(DBBIN)/%.pl:       %.pl
@@ -62,7 +86,7 @@ $(DBBIN)/%.pl:       %.pl
 	cp $< $@
 	chmod $(PMODE) $@
 	if [ -f $(TMPSAV)/$(@F) ]; then rm -f $(TMPSAV)/$(@F); fi
-
+		
 $(CGIBIN)/%.cgi:       %.cgi
 	${PERL} -c $<
 	- pod2man --center "Internet Club DB" $< > $*.1
@@ -108,8 +132,14 @@ $(LIBDIR)/%.cnf:       %.cnf
 	if [ -f $(TMPSAV)/$(@F) ]; then rm -f $(TMPSAV)/$(@F); fi
 
 
+$(HTMLDIR)/%.html:       %.html
+	cp $< $@
+
 
+$(UNSORTED): TEXTS
 
+$(SRCDIR)/%.txt:
+	updatedb $<
 
 srcdeliver:
 	$(RSYNC) $(SRCDIR) $(KULICHKI):$(DESTSRCDIR)
@@ -119,6 +149,17 @@ prgdeliver:
 	$(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC)
 
 dbdeliver:
-	mysqldump -u piataev chgk > $(DUMPDIR)/chgkdump
-	$(RSYNC) $(DUMPDIR)/chgkdump  $(KULICHKI):$(DESTDUMPDIR)
+	mysqldump --add-drop-table -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump.0
+	sed 's/TYPE=ISAM PACK_KEYS=1//g' $(DUMPDIR)/chgkdump.0 > $(DUMPDIR)/chgkdump
+	gzip $(DUMPDIR)/chgkdump
+	rm $(DUMPDIR)/chgkdump.0
+	$(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
+
+updatecvs:
+	cvs update $(SRCDIR)
+
+unsorted: updatecvs $(wildcard $(SRCDIR)*.txt)
+	echo $< >>unsorted
 
+	
+