Diff for /db/prgsrc/Makefile between versions 1.92 and 1.93

version 1.92, 2008/03/17 01:57:13 version 1.93, 2008/11/09 19:22:55
Line 16  DESTSRCDIR=~chgk-db/public_html/dimrub/s Line 16  DESTSRCDIR=~chgk-db/public_html/dimrub/s
 SRCDIR=../baza  SRCDIR=../baza
 DICTDIR=../dict  DICTDIR=../dict
 IMAGEDIR=$(SRCDIR)/images  IMAGEDIR=$(SRCDIR)/images
   SOUNDDIR=$(SRCDIR)/sounds
 DESTIMAGEDIR=~chgk-db/public_html/images/db  DESTIMAGEDIR=~chgk-db/public_html/images/db
 INSTALLIMAGEDIR=$(ROOT)/public_html/images/db  INSTALLIMAGEDIR=$(ROOT)/public_html/images/db
   DESTSOUNDDIR=~chgk-db/public_html/sounds/db
   INSTALLSOUNDDIR=$(ROOT)/public_html/sounds/db
 DESTPRGSRC=~chgk-db/db/prgsrc  DESTPRGSRC=~chgk-db/db/prgsrc
 DESTCGIBIN=~chgk-db/public_html/cgi-bin  DESTCGIBIN=~chgk-db/public_html/cgi-bin
 DUMPDIR=../dump  DUMPDIR=../dump
Line 97  CGIBIN = $(ROOT)/public_html/cgi-bin Line 100  CGIBIN = $(ROOT)/public_html/cgi-bin
 HTMLDIR = $(ROOT)/public_html/dimrub/db  HTMLDIR = $(ROOT)/public_html/dimrub/db
   
 TEXTS = $(wildcard $(SRCDIR)/*.txt) $(SRCDIR)/index  TEXTS = $(wildcard $(SRCDIR)/*.txt) $(SRCDIR)/index
 IMAGES = $(wildcard $(IMAGEDIR)/*.jpg)  IMAGES = $(wildcard $(IMAGEDIR)/*)
   SOUNDS = $(wildcard $(SOUNDDIR)/*)
 IMAGENAMES= $(notdir $(IMAGES))  IMAGENAMES= $(notdir $(IMAGES))
   SOUNDNAMES= $(notdir $(SOUNDS))
   
   
   
Line 107  CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGI Line 112  CGIINSTALL =    ${CGISCRIPTS:%.cgi=$(CGI
 LIBINSTALL =    ${LIBS:%=$(LIBDIR)/%}  LIBINSTALL =    ${LIBS:%=$(LIBDIR)/%}
 HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR)/%.html}  HTMLINSTALL =   ${HTMLS:%.html=$(HTMLDIR)/%.html}
 IMAGEINSTALL =  ${IMAGENAMES:%=$(INSTALLIMAGEDIR)/%}  IMAGEINSTALL =  ${IMAGENAMES:%=$(INSTALLIMAGEDIR)/%}
   SOUNDINSTALL =  ${SOUNDNAMES:%=$(INSTALLSOUNDDIR)/%}
   
   
 all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL) $(IMAGEINSTALL)  all: $(LIBINSTALL) $(BININSTALL) $(CGIINSTALL) $(HTMLINSTALL) \
           $(IMAGEINSTALL) $(SOUNDINSTALL)
   
   
   
Line 177  $(HTMLDIR)/%.html:       %.html Line 184  $(HTMLDIR)/%.html:       %.html
 $(INSTALLIMAGEDIR)/%: $(IMAGEDIR)/%  $(INSTALLIMAGEDIR)/%: $(IMAGEDIR)/%
         cp $< $@                  cp $< $@        
   
   
   $(INSTALLSOUNDDIR)/%: $(SOUNDDIR)/%
           cp $< $@        
   
   
   
 srcdeliver:  srcdeliver:
         $(RSYNC) $(SRCDIR) $(KULICHKI):$(DESTSRCDIR)          $(RSYNC) $(SRCDIR) $(KULICHKI):$(DESTSRCDIR)
   
Line 185  imagedeliver: Line 198  imagedeliver:
         cvs update $(SRCDIR)          cvs update $(SRCDIR)
         $(RSYNC) $(IMAGEDIR)/ $(KULICHKI):$(DESTIMAGEDIR)/          $(RSYNC) $(IMAGEDIR)/ $(KULICHKI):$(DESTIMAGEDIR)/
   
   sounddeliver:
           cvs update $(SRCDIR)
           $(RSYNC) $(SOUNDDIR)/ $(KULICHKI):$(DESTSOUNDDIR)/
   
 prgdeliver:  prgdeliver:
         $(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC)          $(RSYNC) ./ $(KULICHKI):$(DESTPRGSRC)
   
 dbdeliver: imagedeliver  dbdeliver: imagedeliver sounddeliver
         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 -u piataev chgk $(TABLES)  > $(DUMPDIR)/chgkdump
         echo "delete from hash;" >> $(DUMPDIR)/chgkdump          echo "delete from hash;" >> $(DUMPDIR)/chgkdump

Removed from v.1.92  
changed lines
  Added in v.1.93


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