--- db/prgsrc/Makefile	2003/01/09 19:38:33	1.38
+++ db/prgsrc/Makefile	2003/01/12 22:34:09	1.40
@@ -6,10 +6,13 @@ TMPSAV = /tmp
 PMODE = 775
 LMODE = 664
 KULICHKI=znatoki.kulichki.net
-RSYNC = rsync -ruvpte ssh --delete --progress --rsync-path='~/bin/rsync'
+RSYNC = rsync -ruvptCe ssh --delete --progress --rsync-path='~/bin/rsync'
 SCP=scp
 DESTSRCDIR=~piataev/public_html/dimrub/src/
 SRCDIR=../baza
+IMAGEDIR=$(SRCDIR)/images
+DESTIMAGEDIR=~piataev/public_html/images/db
+INSTALLIMAGEDIR=$(ROOT)/public_html/images/db
 DESTPRGSRC=~piataev/db/prgsrc
 DUMPDIR=../dump
 DESTDUMPDIR=/var/tmp/
@@ -24,6 +27,7 @@ UPDATELOG = $(DUMPDIR)/update.log
 UAUTHORS=$(DUMPDIR)/uauthors
 UNSORTED=$(DUMPDIR)/unsorted
 RSPARAMS= 2000 50
+TIMESTAMP= $(DUMPDIR)/timestamp
 
 DBSCRIPTS = mkdb.pl \
 	    updatem.pl \
@@ -71,8 +75,6 @@ HTMLS = contribute.html \
 	search.html  
 
 
-TEXTS = $(SRCDIR)/*.txt
-
 
 DBBIN = ../bin
 MANDIR = ../man
@@ -80,12 +82,22 @@ LIBDIR = ../lib
 CGIBIN = $(ROOT)/public_html/cgi-bin
 HTMLDIR = $(ROOT)/public_html/dimrub/db
 
+TEXTS = $(wildcard $(SRCDIR)/*.txt) $(SRCDIR)/index
+IMAGES = $(wildcard $(IMAGEDIR)/*.jpg)
+IMAGENAMES= $(notdir $(IMAGES))
+
+
+
 BININSTALL =    ${DBSCRIPTS:%=$(DBBIN)/%}
 CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGIBIN)/%.cgi}
 LIBINSTALL =    ${LIBS:%=$(LIBDIR)/%}
 HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR)/%.html}
+IMAGEINSTALL =  ${IMAGENAMES:%=$(INSTALLIMAGEDIR)/%}
+
+all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL) $(IMAGEINSTALL)
+
+
 
-all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL)
 
 
 $(DBBIN)/%.pl:       %.pl
@@ -147,19 +159,20 @@ $(HTMLDIR)/%.html:       %.html
 	cp $< $@
 
 
-$(UNSORTED): TEXTS
-
-$(SRCDIR)/%.txt:
-	updatedb $<
+$(INSTALLIMAGEDIR)/%: $(IMAGEDIR)/%
+	cp $< $@	
 
 srcdeliver:
 	$(RSYNC) $(SRCDIR) $(KULICHKI):$(DESTSRCDIR)
 
 
+imagedeliver:
+	$(RSYNC) $(IMAGEDIR)/ $(KULICHKI):$(DESTIMAGEDIR)
+
 prgdeliver:
 	$(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC)
 
-dbdeliver:
+dbdeliver: imagedeliver
 	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
@@ -169,6 +182,9 @@ dbdeliver:
 
 update: 
 	cvs update $(SRCDIR)
+	$(MAKE) $(TIMESTAMP)
+
+$(TIMESTAMP): $(TEXTS)
 	mysql -upiataev chgk <delq.sql
 	$(DBBIN)/mkdb.pl
 	$(DBBIN)/updateindex.pl -i$(SRCDIR)/index
@@ -184,6 +200,8 @@ update:
 		$(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