--- register/prgsrc/Makefile	2002/11/18 00:55:38	1.10
+++ register/prgsrc/Makefile	2006/04/14 02:07:53	1.15
@@ -6,7 +6,7 @@ TMPSAV = /tmp
 PMODE = 775
 LMODE = 664
 KULICHKI=kulichki.com
-RSYNC = rsync -ruvpte 'ssh -1' --delete --progress --rsync-path='~/bin/rsync'
+RSYNC = rsync -ruvpte 'ssh' --delete --progress --rsync-path='~/bin/rsync'
 DESTPRGSRC=~piataev/register/prgsrc
 DUMPDIR=../dump
 DESTDUMPDIR=/tmp/
@@ -16,6 +16,8 @@ PERLSCRIPTS = addclub.pl \
 
 CGISCRIPTS = register.cgi
 
+REDIRECT = register-redirect.cgi
+
 IMAGES = map.jpg \
 	compass.gif \
 	regions.gif
@@ -29,12 +31,12 @@ IMAGEDIR = $(ROOT)/public_html/images
 HTMLDIR = $(ROOT)/public_html/boris/register
 
 BININSTALL =    ${PERLSCRIPTS:%.pl=$(DBBIN)/%.pl}
-CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGIBIN)/%.cgi}
+CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGIBIN)/protected/%.cgi}
 IMAGESINSTALL = ${IMAGES:%=$(IMAGEDIR)/%}
 HTMLINSTALL = ${HTMLFILES:%=$(HTMLDIR)/%}
+REDIRECTINSTALL = ${REDIRECT:%-redirect.cgi=$(CGIBIN)/%.cgi}
 
-
-all: $(BININSTALL) $(CGIINSTALL) $(IMAGESINSTALL) $(HTMLINSTALL)
+all: $(BININSTALL) $(CGIINSTALL) $(IMAGESINSTALL) $(HTMLINSTALL) $(REDIRECTINSTALL)
 
 
 prgdeliver:
@@ -62,7 +64,7 @@ $(HTMLDIR)/%: %
 
 
 
-$(CGIBIN)/%.cgi:       %.cgi
+$(CGIBIN)/%.cgi:       %-redirect.cgi
 	${PERL} -c $<
 	- pod2man --center "Internet Club DB" $< > $*.1
 	- install -m $(LMODE) $*.1 $(MANDIR)/man1
@@ -71,10 +73,19 @@ $(CGIBIN)/%.cgi:       %.cgi
 	chmod $(PMODE) $@
 	if [ -f $(TMPSAV)/$(@F) ]; then rm -f $(TMPSAV)/$(@F); fi
 
+$(CGIBIN)/protected/%.cgi:       %.cgi
+	${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
+
+
 dbdeliver:
 	- cp dump dump.sav
-	mysqldump --add-drop-table -u piataev chgk Clubs Regions People ClubClub RegionRegion ClubPeople ClubRegion > dump1
-	sed 's/TYPE=ISAM PACK_KEYS=1//g' dump1 >dump
-	scp -1 dump $(KULICHKI):$(DESTPRGSRC)
-	ssh -1 $(KULICHKI) 'mysql -u piataev chgk < $(DESTPRGSRC)/dump '
+	mysqldump --default-character-set=koi8r --add-drop-table --compatible=mysql323 -u piataev chgk Clubs Regions People ClubClub RegionRegion ClubPeople ClubRegion > dump
+	scp  dump $(KULICHKI):$(DESTPRGSRC)
+	ssh  $(KULICHKI) 'mysql -u piataev chgk < $(DESTPRGSRC)/dump '