Changeset 3554c39 in git


Ignore:
Timestamp:
15/06/10 14:00:47 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/survex-1_1, svn/tags/1.1.14, svn/tags/1.1.15, svn/tags/1.1.16, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/tags/v1_1_13, svn/trunk, travis-osx
Children:
018db6f
Parents:
c818632
Message:

Makefile.am,make_release: Just produce a zip file with the
alternative manual formats - a self-extracting .exe is harder to
use on other platforms, and most people have a zip file extractor
installed.

git-svn-id: file:///home/survex-svn/survex/branches/survex-1_1@3427 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rc818632 r3554c39  
     1Tue Jun 15 12:57:13 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * Makefile.am,make_release: Just produce a zip file with the
     4          alternative manual formats - a self-extracting .exe is harder to
     5          use on other platforms, and most people have a zip file extractor
     6          installed.
     7
    18Tue Jun 15 12:36:13 GMT 2010  Olly Betts <olly@survex.com>
    29
  • Makefile.am

    rc818632 r3554c39  
    7272        $(RM) -rf iss_tmp
    7373
    74 dos_doc_zip_name = svxdoc-doswin-@VERSION@.zip
    75 dos_doc_exe_name = svxdoc-doswin-@VERSION@.exe
     74doc_zip_name = svxdoc-@VERSION@.zip
    7675
    77 dos_doc_exe : dos_doc_zip
    78         $(RM) $(dos_doc_exe_name)~
    79         cat dos_extras/unzipsfx.exe $(dos_doc_zip_name) > $(dos_doc_exe_name)~
    80         zip -A $(dos_doc_exe_name)~
    81         mv $(dos_doc_exe_name)~ $(dos_doc_exe_name)
     76doc_zip :
     77        $(RM) $(doc_zip_name)
     78        : # -l means convert LF to CR+LF
     79        cd doc && zip -9 -l ../$(doc_zip_name) $(DOCS_OTHER)
    8280
    83 dos_doc_zip :
    84         $(RM) $(dos_doc_zip_name)
    85         : # -l means convert LF to CR+LF
    86         cd doc && zip -9 -l ../$(dos_doc_zip_name) @DOCS_OTHER@
    87 
    88 .PHONY: mingw mingw_iss dos_doc_exe dos_doc_zip
     81.PHONY: mingw mingw_iss doc_zip
  • make_release

    rc818632 r3554c39  
    5151case $mk in
    5252  *doc*)
    53     make dos_doc_exe ;;
     53    make doc_zip ;;
    5454esac
    5555
Note: See TracChangeset for help on using the changeset viewer.