Diff for /db/prgsrc/Makefile between versions 1.81 and 1.84

version 1.81, 2006/02/27 19:11:59 version 1.84, 2006/09/25 16:35:00
Line 1 Line 1
   HOSTNAME=$(shell hostname)
   ifeq ($(HOSTNAME),bilbo)
   ROOT=/home/znatoki
   endif
 ifndef ROOT  ifndef ROOT
 ROOT = /home/znatoki  ROOT = $(HOME)
 endif  endif
 PERL = perl  PERL = perl
 TMPSAV = /tmp  TMPSAV = /tmp
 PMODE = 775  PMODE = 775
 LMODE = 664  LMODE = 664
 KULICHKI=znatoki.kulichki.net  KULICHKI=chgk-db-boris@ledorub.chgk.info
 RSYNC = rsync -ruvptCe ssh --delete --progress   RSYNC = rsync -ruvptCe ssh --delete --progress 
 SCP=scp  SCP=scp
 DESTSRCDIR=~piataev/public_html/dimrub/src/  DESTSRCDIR=~chgk-db/public_html/dimrub/src/
 SRCDIR=../baza  SRCDIR=../baza
 DICTDIR=../dict  DICTDIR=../dict
 IMAGEDIR=$(SRCDIR)/images  IMAGEDIR=$(SRCDIR)/images
 DESTIMAGEDIR=~piataev/public_html/images/db  DESTIMAGEDIR=~chgk-db/public_html/images/db
 INSTALLIMAGEDIR=$(ROOT)/public_html/images/db  INSTALLIMAGEDIR=$(ROOT)/public_html/images/db
 DESTPRGSRC=~piataev/db/prgsrc  DESTPRGSRC=~chgk-db/db/prgsrc
 DESTCGIBIN=~piataev/public_html/cgi-bin  DESTCGIBIN=~chgk-db/public_html/cgi-bin
 DUMPDIR=../dump  DUMPDIR=../dump
 DESTDUMPDIR=/var/tmp/  DESTDUMPDIR=/var/tmp/
 TABLES= Questions Tournaments word2question nf nests Authors A2Q equalto  TABLES= Questions Tournaments word2question nf nests Authors A2Q equalto
Line 102  LIBINSTALL =    ${LIBS:%=$(LIBDIR)/%} Line 106  LIBINSTALL =    ${LIBS:%=$(LIBDIR)/%}
 HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR)/%.html}  HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR)/%.html}
 IMAGEINSTALL =  ${IMAGENAMES:%=$(INSTALLIMAGEDIR)/%}  IMAGEINSTALL =  ${IMAGENAMES:%=$(INSTALLIMAGEDIR)/%}
   
   
 all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL) $(IMAGEINSTALL)  all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL) $(IMAGEINSTALL)
   
   
Line 183  prgdeliver: Line 188  prgdeliver:
   
 dbdeliver: imagedeliver  dbdeliver: imagedeliver
         echo "Starting delivering" | mail -s"Starting delivering" $(DELIVERER)          echo "Starting delivering" | mail -s"Starting delivering" $(DELIVERER)
         mysqldump --default-character-set=koi8r --add-drop-table -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump          mysqldump --default-character-set=koi8r --add-drop-table --compatible=mysql323 -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump
         echo "delete from hash;" >> $(DUMPDIR)/chgkdump          echo "delete from hash;" >> $(DUMPDIR)/chgkdump
         sed 's/TYPE=ISAM PACK_KEYS=1//g' $(DUMPDIR)/chgkdump |sed 's/ENGINE=MyISAM DEFAULT CHARSET=koi8r//g' > $(DUMPDIR)/chgkdump1  
         mv $(DUMPDIR)/chgkdump1 $(DUMPDIR)/chgkdump  
         gzip $(DUMPDIR)/chgkdump          gzip $(DUMPDIR)/chgkdump
         $(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)          $(SCP) $(DUMPDIR)/chgkdump.gz  $(KULICHKI):$(DESTDUMPDIR)
         echo "Delivered" | mail -s"Database delivered" $(DELIVERER)          echo "Delivered" | mail -s"Database delivered" $(DELIVERER)

Removed from v.1.81  
changed lines
  Added in v.1.84


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>