Changeset 95

Show
Ignore:
Timestamp:
02/04/04 11:13:57 (8 years ago)
Author:
jimmyo
Message:

Applied rpm build patch from Ingvar Hagelund

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile

    • Property cvs2svn:cvs-rev changed from 1.9 to 1.10
    r82 r95  
    180180        fakeroot debian/rules binary 
    181181 
    182 rpm: 
    183         -rm -rf dists/redhat/munin-* dists/redhat/noarch 
    184         -dists/redhat/buildtargz.sh 
    185         -rpmbuild \ 
    186                 --define "_specdir dists/redhat"   \ 
    187                 --define "_sourcedir dists/redhat" \ 
    188                 --define "_srcrpmdir dists/redhat" \ 
    189                 -bs dists/redhat/munin.spec 
    190  
    191         -rpmbuild \ 
    192                 --define "_rpmtopdir `pwd`/dists/redhat" \ 
    193                 --define "_sourcedir %{_rpmtopdir}"      \ 
    194                 --define "_builddir %{_rpmtopdir}"       \ 
    195                 --define "_rpmdir %{_rpmtopdir}"         \ 
    196                 -bb dists/redhat/munin.spec 
    197  
    198         -mv dists/redhat/*rpm .. 
    199         -mv dists/redhat/noarch/*rpm .. 
    200         -rm -rf dists/redhat/munin-* dists/redhat/noarch 
    201  
    202182clean: 
    203183ifeq ($(MAKELEVEL),0) 

  • trunk/dists/redhat/Makefile.config

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r2 r95  
    22 
    33PREFIX   = $(DESTDIR)/usr 
    4 CONFDIR  = $(DESTDIR)/etc/lrrd 
    5 LIBDIR   = $(PREFIX)/share/lrrd 
     4CONFDIR  = $(DESTDIR)/etc/munin 
     5LIBDIR   = $(PREFIX)/share/munin 
    66SBINDIR  = $(PREFIX)/sbin 
    77BINDIR   = $(PREFIX)/bin 
    88MANDIR   = $(PREFIX)/share/man 
    9 HTMLDIR  = $(DESTDIR)/var/www/html/lrrd 
    10 DBDIR    = $(DESTDIR)/var/lib/lrrd 
    11 LOGDIR   = $(DESTDIR)/var/log/lrrd 
    12 STATEDIR = $(DESTDIR)/var/run/lrrd 
    13 PERLLIB  = $(DESTDIR)$(shell ( $(PERL) -V:vendorlib | egrep -v "UNKNOWN|=''" || $(PERL) -V:sitelib) | cut -d= -f 2) 
     9HTMLDIR  = $(DESTDIR)/var/www/html/munin 
     10DBDIR    = $(DESTDIR)/var/lib/munin 
     11LOGDIR   = $(DESTDIR)/var/log/munin 
     12STATEDIR = $(DESTDIR)/var/run/munin 
     13PERLLIB  = $(DESTDIR)$(shell ( $(PERL) -V:vendorlib | egrep -v "UNKNOWN|=''" || $(PERL) -V:sitelib) | cut -d\' -f 2) 
    1414 
    15 # Handled in the lrrd.spec 
     15# Handled in the munin.spec 
    1616CHECKUSER:= true 
    1717CHECKGROUP:= true