Changeset 907


Ignore:
Timestamp:
05/22/13 16:07:02 (8 years ago)
Author:
ramonb
Message:

debian/rules, Makefile:

  • fixed
Location:
branches/1.0
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.0/Makefile

    r904 r907  
    88# Install prefix
    99PREFIX = /usr/local
     10
     11BIN_DIR = $(PREFIX)/sbin
     12JOBMOND = $(BIN_DIR)/jobmond
     13JOBARCHIVED = $(BIN_DIR)/jobarchived
    1014
    1115# What is the location of the Ganglia web frontend
     
    6569        dpkg-buildpackage -b -uc -us
    6670
    67 install: @#
     71install:  ${REQUIRED}
     72        @#
    6873        @# Set the correct GANGLIA_PATH.
    6974        @#
     
    8489        @echo
    8590        @echo "Installing jobmond.py and jobarchived.py to $(PREFIX)/sbin"
    86         @install -m 0755 -d $(DESTDIR)$(PREFIX)/sbin
    87         @install -m 0755 jobmond/jobmond.py $(DESTDIR)$(PREFIX)/sbin/
    88         @install -m 0755 jobarchived/jobarchived.py $(DESTDIR)$(PREFIX)/sbin/
    89         @(cd $(DESTDIR)$(PREFIX)/sbin/; ln -s jobmond.py jobmond; ln -s jobarchived.py jobarchived)
     91        @install -m 0755 -d $(DESTDIR)$(PREFIX)/sbin || true
     92        @install -m 0755 jobmond/jobmond.py $(DESTDIR)$(PREFIX)/sbin/ || true
     93        @install -m 0755 jobarchived/jobarchived.py $(DESTDIR)$(PREFIX)/sbin/ || true
     94        @(cd $(DESTDIR)$(PREFIX)/sbin/; ln -s jobmond.py jobmond; ln -s jobarchived.py jobarchived) || true
    9095        @#
    9196        @# Files specific to distros if /etc/redhat_release => rpm else (/etc/debian_version => debian)
     
    9398        @echo
    9499        @echo "Installing service files in /etc"
    95         @sed -i -e 's/DAEMON=.*/DAEMON=${DESTDIR}${PREFIX}\/sbin\/jobmond/g' pkg/deb/init.d/jobmond
    96         @sed -i -e 's/DAEMON=.*/DAEMON=${DESTDIR}${PREFIX}\/sbin\/jobarchived/g' pkg/deb/init.d/jobarchived
    97         @sed -i -e 's/DAEMON=.*/DAEMON=${DESTDIR}${PREFIX}\/sbin\/jobmond/g' pkg/rpm/init.d/jobmond
    98         @sed -i -e 's/DAEMON=.*/DAEMON=${DESTDIR}${PREFIX}\/sbin\/jobarchived/g' pkg/rpm/init.d/jobarchived
     100        @sed -i -e 's|DAEMON=.*|DAEMON=$(JOBMOND)|g' pkg/deb/init.d/jobmond
     101        @sed -i -e 's|DAEMON=.*|DAEMON=$(JOBARCHIVED)|g' pkg/deb/init.d/jobarchived
     102        @sed -i -e 's|DAEMON=.*|DAEMON=$(JOBMOND)|g' pkg/rpm/init.d/jobmond
     103        @sed -i -e 's|DAEMON=.*|DAEMON=$(JOBARCHIVED)|g' pkg/rpm/init.d/jobarchived
    99104        @if test -r /etc/redhat_release; then \
    100105                install -m 0755 -d $(DESTDIR)/etc/rc.d/init.d; \
  • branches/1.0/debian/rules

    r848 r907  
    55
    66override_dh_auto_install:
    7         dh_auto_install -- PREFIX=/usr GANGLIA_ROOT=/usr/share/ganglia-webfrontend GANGLIA_USER=ganglia HTTPD_USER=www-data JOBARCHIVE_RRDS=/var/lib/jobarchive
     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
Note: See TracChangeset for help on using the changeset viewer.