--- register/prgsrc/Makefile	2002/01/05 23:45:44	1.8
+++ register/prgsrc/Makefile	2006/02/27 14:38:54	1.14
@@ -5,8 +5,8 @@ PERL = perl
 TMPSAV = /tmp
 PMODE = 775
 LMODE = 664
-KULICHKI=znatoki.kulichki.net
-RSYNC = rsync -ruvpte ssh --delete --progress --rsync-path='~/bin/rsync'
+KULICHKI=kulichki.com
+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,19 +31,18 @@ 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:
 	$(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC)
 
 
-
 $(DBBIN)/%.pl:       %.pl
 	${PERL} -c $<
 	- pod2man --center "Internet Club DB" $< > $*.1
@@ -63,7 +64,16 @@ $(HTMLDIR)/%: %
 
 
 
-$(CGIBIN)/%.cgi:       %.cgi
+$(CGIBIN)/%.cgi:       %-redirect.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
+
+$(CGIBIN)/protected/%.cgi:       %.cgi
 	${PERL} -c $<
 	- pod2man --center "Internet Club DB" $< > $*.1
 	- install -m $(LMODE) $*.1 $(MANDIR)/man1
@@ -72,9 +82,11 @@ $(CGIBIN)/%.cgi:       %.cgi
 	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 dump $(KULICHKI):$(DESTPRGSRC)
+	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 '