--- db/prgsrc/Makefile	2003/01/10 18:55:38	1.39
+++ 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/
@@ -72,8 +75,6 @@ HTMLS = contribute.html \
 	search.html  
 
 
-TEXTS = $(wildcard $(SRCDIR)/*.txt) $(SRCDIR)/index
-
 
 DBBIN = ../bin
 MANDIR = ../man
@@ -81,17 +82,23 @@ 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)
 
-install: all
 
-test:
-	echo $(TEXTS)
 
 $(DBBIN)/%.pl:       %.pl
 	${PERL} -c $<
@@ -152,15 +159,20 @@ $(HTMLDIR)/%.html:       %.html
 	cp $< $@
 
 
+$(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