--- register/prgsrc/Makefile	2006/04/14 02:07:53	1.15
+++ register/prgsrc/Makefile	2011/05/09 02:22:01	1.17
@@ -5,9 +5,12 @@ PERL = perl
 TMPSAV = /tmp
 PMODE = 775
 LMODE = 664
-KULICHKI=kulichki.com
-RSYNC = rsync -ruvpte 'ssh' --delete --progress --rsync-path='~/bin/rsync'
-DESTPRGSRC=~piataev/register/prgsrc
+#KULICHKI=kulichki.com
+KULICHKI=chgk-register@registr.chgk.info
+#RSYNC = rsync -ruvpte 'ssh' --delete --progress --rsync-path='~/bin/rsync'
+RSYNC = rsync -ruvpte 'ssh' --delete --progress 
+#DESTPRGSRC=~piataev/register/prgsrc
+DESTPRGSRC=register/prgsrc
 DUMPDIR=../dump
 DESTDUMPDIR=/tmp/
 
@@ -31,10 +34,10 @@ IMAGEDIR = $(ROOT)/public_html/images
 HTMLDIR = $(ROOT)/public_html/boris/register
 
 BININSTALL =    ${PERLSCRIPTS:%.pl=$(DBBIN)/%.pl}
-CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGIBIN)/protected/%.cgi}
+CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGIBIN)/%.cgi}
 IMAGESINSTALL = ${IMAGES:%=$(IMAGEDIR)/%}
 HTMLINSTALL = ${HTMLFILES:%=$(HTMLDIR)/%}
-REDIRECTINSTALL = ${REDIRECT:%-redirect.cgi=$(CGIBIN)/%.cgi}
+#REDIRECTINSTALL = ${REDIRECT:%-redirect.cgi=$(CGIBIN)/%.cgi}
 
 all: $(BININSTALL) $(CGIINSTALL) $(IMAGESINSTALL) $(HTMLINSTALL) $(REDIRECTINSTALL)
 
@@ -64,7 +67,7 @@ $(HTMLDIR)/%: %
 
 
 
-$(CGIBIN)/%.cgi:       %-redirect.cgi
+$(CGIBIN)/%.cgi:       %.cgi
 	${PERL} -c $<
 	- pod2man --center "Internet Club DB" $< > $*.1
 	- install -m $(LMODE) $*.1 $(MANDIR)/man1
@@ -85,7 +88,9 @@ $(CGIBIN)/protected/%.cgi:       %.cgi
 
 dbdeliver:
 	- cp dump dump.sav
-	mysqldump --default-character-set=koi8r --add-drop-table --compatible=mysql323 -u piataev chgk Clubs Regions People ClubClub RegionRegion ClubPeople ClubRegion > dump
+	mysqldump --default-character-set=koi8r --add-drop-table  -u piataev register Clubs Regions People ClubClub RegionRegion ClubPeople ClubRegion > dump1
+	sed '/character_set/d' <dump1 >dump
+	rm dump1
 	scp  dump $(KULICHKI):$(DESTPRGSRC)
-	ssh  $(KULICHKI) 'mysql -u piataev chgk < $(DESTPRGSRC)/dump '
+	ssh  $(KULICHKI) 'mysql -u piataev register < $(DESTPRGSRC)/dump '