[popfile-commit] engine Makefile, 1.41.4.6, 1.41.4.7 vars.mak, 1.11.4.6, 1.11.4.7

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22636

Modified Files:
      Tag: b0_22_2
	Makefile vars.mak 
Log Message:
Remove references to the obsolete manual because the files have been
deleted from CVS. Move the hard-coded path out of the Makefile and
into vars.mak to make it easier to find and modify the path.

Index: vars.mak
===================================================================
RCS file: /cvsroot/popfile/engine/vars.mak,v
retrieving revision 1.11.4.6
retrieving revision 1.11.4.7
diff -C2 -d -r1.11.4.6 -r1.11.4.7
*** vars.mak	5 Mar 2008 18:44:42 -0000	1.11.4.6
--- vars.mak	9 Apr 2008 12:05:51 -0000	1.11.4.7
***************
*** 12,15 ****
--- 12,16 ----
  export POPFILE_REVISION=1
  export POPFILE_VERSION:=$(POPFILE_MAJOR_VERSION).$(POPFILE_MINOR_VERSION).$(POPFILE_REVISION)
+ ABSOLUTE_ENGINE_PATH := c:/cygwin/home/Administrator/engine
  POPFILE_VERSION_FILE=POPFile/popfile_version
  POPFILE_ZIP := popfile-$(POPFILE_VERSION)$(RC).zip

Index: Makefile
===================================================================
RCS file: /cvsroot/popfile/engine/Makefile,v
retrieving revision 1.41.4.6
retrieving revision 1.41.4.7
diff -C2 -d -r1.41.4.6 -r1.41.4.7
*** Makefile	5 Mar 2008 18:44:42 -0000	1.41.4.6
--- Makefile	9 Apr 2008 12:05:51 -0000	1.41.4.7
***************
*** 8,12 ****
  include vars.mak
  
! .PHONY: test package windows core manual skins coverage macosx rc
  
  error:
--- 8,12 ----
  include vars.mak
  
! .PHONY: test package windows core skins coverage macosx rc
  
  error:
***************
*** 96,100 ****
  # Builds a Windows service version of POPFile using PerlSvc
  
! SVC_OPTIONS = $(COMMON_EXE_OPTIONS) --lib c:/cygwin/home/Administrator/engine
  
  popfile-service.exe: popfile-service.pl
--- 96,100 ----
  # Builds a Windows service version of POPFile using PerlSvc
  
! SVC_OPTIONS = $(COMMON_EXE_OPTIONS) --lib $(ABSOLUTE_ENGINE_PATH)
  
  popfile-service.exe: popfile-service.pl
***************
*** 111,115 ****
  BUILD_ZIP=wzzip -P $(POPFILE_ZIP) -a $^
  xplat: $(POPFILE_ZIP)
! $(POPFILE_ZIP): core manual skins POPFile/popfile_version
  
  core: popfile.pl otto.gif otto.png pix.gif black.gif bayes.pl pipe.pl insert.pl Classifier/*.pm POPFile/*.pm Proxy/*.pm Services/*.pm  Services/IMAP/*.pm UI/*.pm v$(POPFILE_VERSION).change v$(POPFILE_VERSION).change.nihongo license stopwords favicon.ico $(POPFILE_VERSION_FILE) Classifier/popfile.sql popfile.pck
--- 111,115 ----
  BUILD_ZIP=wzzip -P $(POPFILE_ZIP) -a $^
  xplat: $(POPFILE_ZIP)
! $(POPFILE_ZIP): core skins POPFile/popfile_version
  
  core: popfile.pl otto.gif otto.png pix.gif black.gif bayes.pl pipe.pl insert.pl Classifier/*.pm POPFile/*.pm Proxy/*.pm Services/*.pm  Services/IMAP/*.pm UI/*.pm v$(POPFILE_VERSION).change v$(POPFILE_VERSION).change.nihongo license stopwords favicon.ico $(POPFILE_VERSION_FILE) Classifier/popfile.sql popfile.pck
***************
*** 117,123 ****
  	$(BUILD_ZIP)
  
- manual: manual/*.gif manual/en/*.html languages/*.msg
- 	$(BUILD_ZIP)
- 
  .PHONY: skins_css skins_gif skins_thtml
  skins: skins_css skins_gif skins_thtml
--- 117,120 ----