Changeset 919


Ignore:
Timestamp:
05/23/13 15:16:43 (8 years ago)
Author:
ramonb
Message:

Makefile:

  • removed install of Debian init.d, default file
  • first install .conf files and make sure DESTDIR/etc exists

debian/rules:

  • set DESTDIR as variable for all other dh_ calls
  • no longer need to override dh_install

pkg/deb/default/jobmond -> debian/jobmonarch-jobmond.default : moved
pkg/deb/init.d/jobmond -> debian/jobmonarch-jobmond.init : moved
pkg/deb/default/jobarchived -> debian/jobmonarch-jobarchived.default : moved
pkg/deb/init.d/jobarchived -> debian/jobmonarch-jobarchived.init : moved

Location:
branches/1.0
Files:
4 edited
4 moved

Legend:

Unmodified
Added
Removed
  • branches/1.0/Makefile

    r918 r919  
    9595        @echo
    9696        @echo "Installing jobmond.py and jobarchived.py to $(PREFIX)/sbin"
    97         @install -m 0755 -d $(DESTDIR)$(PREFIX)/sbin || true
    98         @install -m 0755 jobmond/jobmond.py $(DESTDIR)$(PREFIX)/sbin/ || true
    99         @install -m 0755 jobarchived/jobarchived.py $(DESTDIR)$(PREFIX)/sbin/ || true
    100         @(cd $(DESTDIR)$(PREFIX)/sbin/; ln -s jobmond.py jobmond; ln -s jobarchived.py jobarchived) || true
     97        @install -m 0755 -d $(DESTDIR)$(PREFIX)/sbin
     98        @install -m 0755 jobmond/jobmond.py $(DESTDIR)$(PREFIX)/sbin/
     99        @install -m 0755 jobarchived/jobarchived.py $(DESTDIR)$(PREFIX)/sbin/
     100        @(cd $(DESTDIR)$(PREFIX)/sbin/; ln -s jobmond.py jobmond; ln -s jobarchived.py jobarchived)
     101        @#
     102        @# Files in /etc
     103        @#
     104        @echo
     105        @echo "Installing config files jobmond.conf jobarchived.conf in /etc"
     106        @install -m 0755 -d $(DESTDIR)/etc
     107        @install -m 0644 jobmond/jobmond.conf $(DESTDIR)/etc/
     108        @install -m 0644 jobarchived/jobarchived.conf $(DESTDIR)/etc/
    101109        @#
    102110        @# Files specific to distros if /etc/redhat-release => rpm else (/etc/debian_version => debian)
    103111        @#
    104         @echo
    105         @echo "Installing service files in /etc"
    106         @sed -i -e 's|DAEMON=.*|DAEMON=$(JOBMOND)|g' pkg/deb/init.d/jobmond
    107         @sed -i -e 's|DAEMON=.*|DAEMON=$(JOBARCHIVED)|g' pkg/deb/init.d/jobarchived
    108         @sed -i -e 's|DAEMON=.*|DAEMON=$(JOBMOND)|g' pkg/rpm/init.d/jobmond
    109         @sed -i -e 's|DAEMON=.*|DAEMON=$(JOBARCHIVED)|g' pkg/rpm/init.d/jobarchived
    110112        @if test -r /etc/redhat-release; then \
     113                echo; \
     114                echo "Red Hat detected: installing RPM service files in /etc"; \
     115                sed -i -e 's|DAEMON=.*|DAEMON=$(JOBMOND)|g' pkg/rpm/init.d/jobmond; \
     116                sed -i -e 's|DAEMON=.*|DAEMON=$(JOBARCHIVED)|g' pkg/rpm/init.d/jobarchived; \
    111117                install -m 0755 -d $(DESTDIR)/etc/rc.d/init.d; \
    112118                install -m 0755 pkg/rpm/init.d/jobmond $(DESTDIR)/etc/rc.d/init.d/; \
     
    115121                install -m 0755 pkg/rpm/sysconfig/jobmond $(DESTDIR)/etc/sysconfig; \
    116122                install -m 0755 pkg/rpm/sysconfig/jobarchived $(DESTDIR)/etc/sysconfig; \
    117         else \
    118                 install -m 0755 -d $(DESTDIR)/etc/init.d; \
    119                 install -m 0755 pkg/deb/init.d/jobmond $(DESTDIR)/etc/init.d/; \
    120                 install -m 0755 pkg/deb/init.d/jobarchived $(DESTDIR)/etc/init.d/; \
    121                 install -m 0755 -d $(DESTDIR)/etc/default; \
    122                 install -m 0755 pkg/deb/default/jobmond $(DESTDIR)/etc/default; \
    123                 install -m 0755 pkg/deb/default/jobarchived $(DESTDIR)/etc/default; \
     123    else \
     124                sed -i -e 's|DAEMON=.*|DAEMON=$(JOBMOND)|g' debian/jobmonarch-jobmond.init; \
     125                sed -i -e 's|DAEMON=.*|DAEMON=$(JOBARCHIVED)|g' debian/jobmonarch-jobarchived.init; \
    124126        fi
    125         @#
    126         @# Files in /etc
    127         @#
    128         @echo
    129         @echo "Installing config files jobmond.conf jobarchived.conf in /etc"
    130         @install -m 0644 jobmond/jobmond.conf $(DESTDIR)/etc
    131         @install -m 0644 jobarchived/jobarchived.conf $(DESTDIR)/etc
    132127        @#
    133128        @# Files in /usr/share
  • branches/1.0/debian/jobmonarch-jobarchived.install

    r846 r919  
    1 etc/jobarchived.conf
    2 etc/default/jobarchived
    3 etc/init.d/jobarchived
    4 usr/sbin/jobarchived.py
    5 
     1/etc/jobarchived.conf
     2/usr/sbin/jobarchived.py
  • branches/1.0/debian/jobmonarch-jobmond.install

    r846 r919  
    1 etc/jobmond.conf
    2 etc/default/jobmond
    3 etc/init.d/jobmond
    4 usr/sbin/jobmond.py
     1/usr/sbin/jobmond.py
     2/etc/jobmond.conf
  • branches/1.0/debian/rules

    r907 r919  
    11#!/usr/bin/make -f
     2
     3BUILDDIR := debian/tmp
     4DESTDIR := ${CURDIR}/${BUILDDIR}
    25
    36%:
     
    58
    69override_dh_auto_install:
    7         $(MAKE) DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr GANGLIA_ROOT=/usr/share/ganglia-webfrontend GANGLIA_USER=ganglia HTTPD_USER=www-data JOBARCHIVE_RRDS=/var/lib/jobarchive install
    8         dh_install --autodest --sourcedir=$(CURDIR)/debian/tmp
     10        $(MAKE) DESTDIR=$(DESTDIR)/ PREFIX=/usr GANGLIA_ROOT=/usr/share/ganglia-webfrontend GANGLIA_USER=ganglia HTTPD_USER=www-data JOBARCHIVE_RRDS=/var/lib/jobarchive install
Note: See TracChangeset for help on using the changeset viewer.