--- register/prgsrc/Makefile	2001/09/03 21:27:19	1.2
+++ register/prgsrc/Makefile	2006/02/27 14:38:54	1.14
@@ -5,42 +5,66 @@ PERL = perl
 TMPSAV = /tmp
 PMODE = 775
 LMODE = 664
-KULICHKI=znatoki.kulichki.net
-RSYNC = rsync -ruvpte ssh --delete --progress --rsync-path='~/bin/rsync'
-DESTSRCDIR=~piataev/public_html/dimrub/src/
-SRCDIR=../baza/
+KULICHKI=kulichki.com
+RSYNC = rsync -ruvpte 'ssh' --delete --progress --rsync-path='~/bin/rsync'
 DESTPRGSRC=~piataev/register/prgsrc
 DUMPDIR=../dump
 DESTDUMPDIR=/tmp/
 
+PERLSCRIPTS = addclub.pl \
+	updatemap.pl
 
 CGISCRIPTS = register.cgi
+
+REDIRECT = register-redirect.cgi
+
 IMAGES = map.jpg \
-	compass.gif
+	compass.gif \
+	regions.gif
+
+HTMLFILES = regions.html
 
 DBBIN = ../bin
 MANDIR = ../man
 CGIBIN = $(ROOT)/public_html/cgi-bin
 IMAGEDIR = $(ROOT)/public_html/images
+HTMLDIR = $(ROOT)/public_html/boris/register
 
-BININSTALL =    ${DBSCRIPTS:%.pl=$(DBBIN)/%.pl}
-CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGIBIN)/%.cgi}
+BININSTALL =    ${PERLSCRIPTS:%.pl=$(DBBIN)/%.pl}
+CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGIBIN)/protected/%.cgi}
 IMAGESINSTALL = ${IMAGES:%=$(IMAGEDIR)/%}
+HTMLINSTALL = ${HTMLFILES:%=$(HTMLDIR)/%}
+REDIRECTINSTALL = ${REDIRECT:%-redirect.cgi=$(CGIBIN)/%.cgi}
 
-
-all: $(BININSTALL) $(CGIINSTALL) $(IMAGESINSTALL)
+all: $(BININSTALL) $(CGIINSTALL) $(IMAGESINSTALL) $(HTMLINSTALL) $(REDIRECTINSTALL)
 
 
 prgdeliver:
 	$(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC)
 
-dbdeliver:
-	mysqldump -u piataev chgk > $(DUMPDIR)/chgkdump
-	$(RSYNC) $(DUMPDIR)/chgkdump  $(KULICHKI):$(DESTDUMPDIR)
 
+$(DBBIN)/%.pl:       %.pl
+	${PERL} -c $<
+	- pod2man --center "Internet Club DB" $< > $*.1
+	- install -m $(LMODE) $*.1 $(MANDIR)/man1
+	if [ -f $@ ]; then mv $@ $(TMPSAV); fi
+	cp $< $@
+	chmod $(PMODE) $@
+	if [ -f $(TMPSAV)/$(@F) ]; then rm -f $(TMPSAV)/$(@F); fi
 
 
-$(DBBIN)/%.pl:       %.pl
+
+$(IMAGEDIR)/%: %
+	install -m $(LMODE) $< $@
+
+
+$(HTMLDIR)/%: %
+	install -m $(LMODE) $< $@
+
+
+
+
+$(CGIBIN)/%.cgi:       %-redirect.cgi
 	${PERL} -c $<
 	- pod2man --center "Internet Club DB" $< > $*.1
 	- install -m $(LMODE) $*.1 $(MANDIR)/man1
@@ -49,7 +73,7 @@ $(DBBIN)/%.pl:       %.pl
 	chmod $(PMODE) $@
 	if [ -f $(TMPSAV)/$(@F) ]; then rm -f $(TMPSAV)/$(@F); fi
 
-$(CGIBIN)/%.cgi:       %.cgi
+$(CGIBIN)/protected/%.cgi:       %.cgi
 	${PERL} -c $<
 	- pod2man --center "Internet Club DB" $< > $*.1
 	- install -m $(LMODE) $*.1 $(MANDIR)/man1
@@ -59,6 +83,10 @@ $(CGIBIN)/%.cgi:       %.cgi
 	if [ -f $(TMPSAV)/$(@F) ]; then rm -f $(TMPSAV)/$(@F); fi
 
 
-$(IMAGEDIR)/% : %
-	install -m $(LMODE) $< $@
+dbdeliver:
+	- cp dump dump.sav
+	mysqldump --default-character-set=koi8r --add-drop-table -u piataev chgk Clubs Regions People ClubClub RegionRegion ClubPeople ClubRegion > dump1
+	sed 's/TYPE=ISAM PACK_KEYS=1//g' dump1 |sed 's/ENGINE=MyISAM DEFAULT CHARSET=koi8r//g' >dump
+	scp  dump $(KULICHKI):$(DESTPRGSRC)
+	ssh  $(KULICHKI) 'mysql -u piataev chgk < $(DESTPRGSRC)/dump '