Changeset 907

Timestamp:

05/22/13 16:07:02 (10 years ago)

Author:

ramonb

Message:

debian/rules, Makefile:

• fixed

Location:

branches/1.0

Files:

• Makefile (modified) (4 diffs)
• debian/rules (modified) (1 diff)

branches/1.0/Makefile

@@ -8 +8 @@
 # Install prefix
 PREFIX = /usr/local
+
+BIN_DIR = $(PREFIX)/sbin
+JOBMOND = $(BIN_DIR)/jobmond
+JOBARCHIVED = $(BIN_DIR)/jobarchived
 
 # What is the location of the Ganglia web frontend
@@ -65 +69 @@
         dpkg-buildpackage -b -uc -us
 
-install: @#
+install:  ${REQUIRED}
+        @#
         @# Set the correct GANGLIA_PATH.
         @#
@@ -84 +89 @@
         @echo
         @echo "Installing jobmond.py and jobarchived.py to $(PREFIX)/sbin"
-        @install -m 0755 -d $(DESTDIR)$(PREFIX)/sbin
-        @install -m 0755 jobmond/jobmond.py $(DESTDIR)$(PREFIX)/sbin/
-        @install -m 0755 jobarchived/jobarchived.py $(DESTDIR)$(PREFIX)/sbin/
-        @(cd $(DESTDIR)$(PREFIX)/sbin/; ln -s jobmond.py jobmond; ln -s jobarchived.py jobarchived)
+        @install -m 0755 -d $(DESTDIR)$(PREFIX)/sbin || true
+        @install -m 0755 jobmond/jobmond.py $(DESTDIR)$(PREFIX)/sbin/ || true
+        @install -m 0755 jobarchived/jobarchived.py $(DESTDIR)$(PREFIX)/sbin/ || true
+        @(cd $(DESTDIR)$(PREFIX)/sbin/; ln -s jobmond.py jobmond; ln -s jobarchived.py jobarchived) || true
         @#
         @# Files specific to distros if /etc/redhat_release => rpm else (/etc/debian_version => debian)
@@ -93 +98 @@
         @echo
         @echo "Installing service files in /etc"
-        @sed -i -e 's/DAEMON=.*/DAEMON=${DESTDIR}${PREFIX}\/sbin\/jobmond/g' pkg/deb/init.d/jobmond
-        @sed -i -e 's/DAEMON=.*/DAEMON=${DESTDIR}${PREFIX}\/sbin\/jobarchived/g' pkg/deb/init.d/jobarchived
-        @sed -i -e 's/DAEMON=.*/DAEMON=${DESTDIR}${PREFIX}\/sbin\/jobmond/g' pkg/rpm/init.d/jobmond
-        @sed -i -e 's/DAEMON=.*/DAEMON=${DESTDIR}${PREFIX}\/sbin\/jobarchived/g' pkg/rpm/init.d/jobarchived
+        @sed -i -e 's|DAEMON=.*|DAEMON=$(JOBMOND)|g' pkg/deb/init.d/jobmond
+        @sed -i -e 's|DAEMON=.*|DAEMON=$(JOBARCHIVED)|g' pkg/deb/init.d/jobarchived
+        @sed -i -e 's|DAEMON=.*|DAEMON=$(JOBMOND)|g' pkg/rpm/init.d/jobmond
+        @sed -i -e 's|DAEMON=.*|DAEMON=$(JOBARCHIVED)|g' pkg/rpm/init.d/jobarchived
         @if test -r /etc/redhat_release; then \
                 install -m 0755 -d $(DESTDIR)/etc/rc.d/init.d; \

branches/1.0/debian/rules

@@ -5 +5 @@
 
 override_dh_auto_install:
-        dh_auto_install -- PREFIX=/usr GANGLIA_ROOT=/usr/share/ganglia-webfrontend GANGLIA_USER=ganglia HTTPD_USER=www-data JOBARCHIVE_RRDS=/var/lib/jobarchive
+        $(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
+        dh_install --autodest --sourcedir=$(CURDIR)/debian/tmp