Changeset 453

Show
Ignore:
Timestamp:
11/20/04 21:00:18 (8 years ago)
Author:
jimmyo
Message:

Changed variable name of ARCH to OSTYPE, to avoid name crash on newer
FreeBSDs (SF#1068238).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    • Property cvs2svn:cvs-rev changed from 1.174 to 1.175
    r451 r453  
    6363    * Added wildcard plugin generic/smart_, contributed by Nicolas Stransky. 
    6464    * Added plugin generic/loggrep for generic log grepping. 
    65         * Fixed bug in generic/sendmail_mailqueue, when queue is empty. 
     65    * Fixed bug in generic/sendmail_mailqueue, when queue is empty. 
     66 
     67  - Installation 
     68    * Changed variable name of ARCH to OSTYPE, to avoid name crash on newer 
     69      FreeBSDs (SF#1068238). 
    6670 
    6771munin (1.1.4) 

  • trunk/Makefile

    • Property cvs2svn:cvs-rev changed from 1.24 to 1.25
    r449 r453  
    7272 
    7373install-node-plugins: build 
    74         for p in build/node/node.d.$(ARCH)/* build/node/node.d/*; do                  \ 
     74        for p in build/node/node.d.$(OSTYPE)/* build/node/node.d/*; do                \ 
    7575                if test -f "$$p" ; then                                                 \ 
    7676                        family=`sed -n 's/^#%# family=\(.*\)$$/\1/p' $$p`;              \ 
    …… 
    130130                    -e 's|@@PERL@@|$(PERL)|g'                           \ 
    131131                    -e 's|@@PERLLIB@@|$(PERLLIB)|g'                     \ 
    132                     -e 's|@@ARCH@@|$(ARCH)|g'                         \ 
     132                    -e 's|@@OSTYPE@@|$(OSTYPE)|g'                             \ 
    133133                    -e 's|@@HOSTNAME@@|$(HOSTNAME)|g'                   \ 
    134134                    -e 's|@@VERSION@@|$(VERSION)|g'                     \ 

  • trunk/Makefile.config

    • Property cvs2svn:cvs-rev changed from 1.5 to 1.6
    r240 r453  
    5353 
    5454# Client only - Install plugins for this architecture 
    55 ARCH       = $(shell uname | tr '[A-Z]' '[a-z]') 
     55OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]') 
    5656 
    5757# How to figure out the hostname. (Only used in default configuration 

  • trunk/dists/sunos/Makefile

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r236 r453  
    1212#BUILD    = $(PKGNAME)-$(VERSION) 
    1313BUILD    = ../../ 
    14 ARCH   = $(shell uname -p) 
     14OSTYPE         = $(shell uname -p) 
    1515 
    1616PATH    := "/opt/SUNWspro/bin/:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin/" 
    …… 
    1818DESTDIR := dists/sunos/install/dist/ 
    1919 
    20 all: $(PKGNAME)-$(VERSION)-$(ARCH).pkg $(PKGNAME)-node-$(VERSION)-$(ARCH).pkg 
     20all: $(PKGNAME)-$(VERSION)-$(OSTYPE).pkg $(PKGNAME)-node-$(VERSION)-$(OSTYPE).pkg 
    2121 
    2222clean:  
    …… 
    6262        echo "PKG=$(PKGNAME)-node"; \ 
    6363        echo "NAME=$(PKGNAME)-node"; \ 
    64         echo "ARCH=$(ARCH)"; \ 
     64        echo "OSTYPE=$(OSTYPE)"; \ 
    6565        echo "VERSION=$(VERSION)"; \ 
    6666        echo "CATEGORY=application"; \ 
    …… 
    8080        echo "PKG=$(PKGNAME)"; \ 
    8181        echo "NAME=$(PKGNAME)"; \ 
    82         echo "ARCH=$(ARCH)"; \ 
     82        echo "OSTYPE=$(OSTYPE)"; \ 
    8383        echo "VERSION=$(VERSION)"; \ 
    8484        echo "CATEGORY=application"; \ 
    …… 
    125125        cd install; rm prototype || true; ln -s node-prototype prototype; pkgmk -d . 
    126126 
    127 $(PKGNAME)-$(VERSION)-$(ARCH).pkg: install/$(PKGNAME) 
     127$(PKGNAME)-$(VERSION)-$(OSTYPE).pkg: install/$(PKGNAME) 
    128128        pkgtrans `pwd`/install $@ $(PKGNAME) 
    129         mv install/$(PKGNAME)-$(VERSION)-$(ARCH).pkg . 
     129        mv install/$(PKGNAME)-$(VERSION)-$(OSTYPE).pkg . 
    130130 
    131 $(PKGNAME)-node-$(VERSION)-$(ARCH).pkg: install/$(PKGNAME)-node 
     131$(PKGNAME)-node-$(VERSION)-$(OSTYPE).pkg: install/$(PKGNAME)-node 
    132132        pkgtrans `pwd`/install $@ $(PKGNAME)-node 
    133         mv install/$(PKGNAME)-node-$(VERSION)-$(ARCH).pkg . 
     133        mv install/$(PKGNAME)-node-$(VERSION)-$(OSTYPE).pkg .