X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=make.bat;h=cbd49dfa3d63eedc1eb0a75f469c0b33c5d895e9;hb=fda79fc773c3018266173a6c4ea3776685845c1d;hp=9e310663e652805b7ef7ac4eae3db4bf0f2ec977;hpb=d9b38818a5081fa0694767b7933ef3ad89fbb374;p=gnus

diff --git a/make.bat b/make.bat
index 9e310663e..cbd49dfa3 100644
--- a/make.bat
+++ b/make.bat
@@ -28,28 +28,41 @@ set PWD=
 
 if "%1" == "" goto usage
 
+rem Directory where the info files are installed
+set GNUS_INFO_DIR=%1\info
+
 rem Emacs 20.7 no longer includes emacs.bat. Use emacs.exe if the batch file is
 rem not present -- this also fixes the problem about too many parameters on Win9x.
 set emacs=emacs.exe
 if exist %1\bin\emacs.bat set emacs=emacs.bat
+set EMACSBATCH=call %1\bin\%emacs% -no-site-file -batch -q
 
 cd lisp
-call %1\bin\%emacs% -batch -q -no-site-file -l ./dgnushack.el -f dgnushack-compile
-if not "%2" == "copy" goto info
+%EMACSBATCH% -l ./dgnushack.el -f dgnushack-compile
+if not "%2" == "/copy" goto info
 attrib -r %1\lisp\gnus\*
 copy *.el* %1\lisp\gnus
 
 :info
-set EMACSINFOHACK="(while (re-search-forward \"@\\(end \\)?ifnottex\" nil t) (replace-match \"\"))"
+set EMACSINFO=%EMACSBATCH% -l infohack.el -f batch-makeinfo
 cd ..\texi
-call %1\bin\%emacs% -batch -q -no-site-file message.texi -eval %EMACSINFOHACK% -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer
-call %1\bin\%emacs% -batch -q -no-site-file emacs-mime.texi -eval %EMACSINFOHACK% -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer
-call %1\bin\%emacs% -batch -q -no-site-file gnus.texi -eval %EMACSINFOHACK% -eval "(setq max-lisp-eval-depth 600)" -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer
-if not "%2" == "copy" goto done
-copy gnus %1\info
-copy gnus-?? %1\info
-copy message %1\info
-copy emacs-mime %1\info
+%EMACSINFO% message.texi
+%EMACSINFO% emacs-mime.texi
+%EMACSINFO% gnus.texi
+if not "%2" == "/copy" goto done
+copy gnus       %GNUS_INFO_DIR%
+copy gnus-?     %GNUS_INFO_DIR%
+copy gnus-??    %GNUS_INFO_DIR%
+copy message    %GNUS_INFO_DIR%
+copy message-?  %GNUS_INFO_DIR%
+copy emacs-mime %GNUS_INFO_DIR%
+copy sieve      %GNUS_INFO_DIR%
+copy pgg        %GNUS_INFO_DIR%
+echo Maybe you should add the following line to %GNUS_INFO_DIR%\dir:
+echo.
+echo * PGG: (pgg).		Emacs interface to various PGP implementations.
+echo * Sieve: (sieve).	Managing Sieve scripts in Emacs.
+echo.
 
 :etc
 cd ..\etc
@@ -60,11 +73,11 @@ cd ..
 goto end
 
 :usage
-echo Usage: make :emacs-dir: [copy]
+echo Usage: make :emacs-dir: [/copy]
 echo.
 echo where: :emacs-dir: is the directory you installed emacs in
 echo                    eg. d:\emacs\20.4
-echo        copy indicates that the compiled files should be copied to your
+echo        /copy indicates that the compiled files should be copied to your
 echo             emacs lisp, info, and etc directories
 echo.
 echo Note: If you have Emacs/w3 you should set the environment variable 
@@ -74,4 +87,6 @@ echo                 set W3DIR=d:\lisp\w3-4.0pre46\lisp
 rem Restore PWD so whoever called this batch file doesn't get confused
 set PWD=%GNUS_PWD_SAVE%
 set GNUS_PWD_SAVE=
+set EMACSBATCH=
+set GNUS_INFO_DIR=
 :end