Changeset 98fbcf6 in git


Ignore:
Timestamp:
15/06/10 12:24:37 (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:
8ed91e39
Parents:
098acb1
Message:

Makefile.am,make_release: I can't persuade rpmbuild to work sanely,
and people can just as easily build binary RPMs from the source
tarball as from the srpm, so just remove the rpm target from the
makefile and code which uses it from make_release - it's less to
have to maintain too.

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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r098acb1 r98fbcf6  
     1Tue Jun 15 11:22:56 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * Makefile.am,make_release: I can't persuade rpmbuild to work sanely,
     4          and people can just as easily build binary RPMs from the source
     5          tarball as from the srpm, so just remove the rpm target from the
     6          makefile and code which uses it from make_release - it's less to
     7          have to maintain too.
     8
    19Tue Jun 15 10:59:12 GMT 2010  Olly Betts <olly@survex.com>
    210
  • Makefile.am

    r098acb1 r98fbcf6  
    3333TODO: doc/TODO.htm
    3434        w3m -dump doc/TODO.htm > TODO
    35 
    36 rpm : dist
    37         : # spec file is produced using AC_OUTPUT
    38         echo %_topdir `pwd` > rpmmacros
    39         echo %_rpmdir `pwd` >> rpmmacros
    40         echo %_sourcedir `pwd` >> rpmmacros
    41         echo %_specdir `pwd` >> rpmmacros
    42         echo %_srcrpmdir `pwd` >> rpmmacros
    43         echo %_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm >> rpmmacros
    44         : #
    45         echo macrofiles : `rpmbuild --showrc | sed 's/^macrofiles\> *: //p;d'`:`pwd`/rpmmacros > rpmrc
    46         : #
    47         rm -rf BUILD
    48         mkdir BUILD
    49         : #
    50         rpmbuild -bs --clean --rcfile /usr/lib/rpm/rpmrc:`pwd`/rpmrc survex.spec
    5135
    5236mingw : all mingw_iss
     
    10286        cd doc && zip -9 -l ../$(dos_doc_zip_name) @DOCS_OTHER@
    10387
    104 .PHONY: rpm mingw mingw_iss dos_doc_exe dos_doc_zip
     88.PHONY: mingw mingw_iss dos_doc_exe dos_doc_zip
  • make_release

    r098acb1 r98fbcf6  
    1111   shift
    1212fi
    13 mk=${*:-"src rpm doc mingw"}
     13mk=${*:-"src doc mingw"}
    1414
    1515if test x"$rel" = xyes ; then
     
    5050
    5151case $mk in
    52   *rpm*)
    53     if rpmbuild --version > /dev/null 2> /dev/null ; then
    54       make rpm
    55     else
    56       echo rpmbuild not installed - skipping rpm generation
    57     fi
    58     ;;
    59 esac
    60 
    61 case $mk in
    6252  *doc*)
    6353    make dos_doc_exe ;;
Note: See TracChangeset for help on using the changeset viewer.