Changeset 919 for branches/1.0/debian

Timestamp:

05/23/13 15:16:43 (11 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/debian

Files:

• jobmonarch-jobarchived.default (moved) (moved from branches/1.0/pkg/deb/default/jobarchived)
• jobmonarch-jobarchived.init (moved) (moved from branches/1.0/pkg/deb/init.d/jobarchived)
• jobmonarch-jobarchived.install (modified) (1 diff)
• jobmonarch-jobmond.default (moved) (moved from branches/1.0/pkg/deb/default/jobmond)
• jobmonarch-jobmond.init (moved) (moved from branches/1.0/pkg/deb/init.d/jobmond)
• jobmonarch-jobmond.install (modified) (1 diff)
• rules (modified) (2 diffs)

branches/1.0/debian/jobmonarch-jobarchived.install

@@ -1 @@
-etc/jobarchived.conf
-etc/default/jobarchived
-etc/init.d/jobarchived
-usr/sbin/jobarchived.py
-
+/etc/jobarchived.conf
+/usr/sbin/jobarchived.py

branches/1.0/debian/jobmonarch-jobmond.install

@@ -1 @@
-etc/jobmond.conf
-etc/default/jobmond
-etc/init.d/jobmond
-usr/sbin/jobmond.py
+/usr/sbin/jobmond.py
+/etc/jobmond.conf

branches/1.0/debian/rules

@@ -1 +1 @@
 #!/usr/bin/make -f
+
+BUILDDIR := debian/tmp
+DESTDIR := ${CURDIR}/${BUILDDIR}
 
 %:
@@ -5 +8 @@
 
 override_dh_auto_install:
-        $(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
+        $(MAKE) DESTDIR=$(DESTDIR)/ PREFIX=/usr GANGLIA_ROOT=/usr/share/ganglia-webfrontend GANGLIA_USER=ganglia HTTPD_USER=www-data JOBARCHIVE_RRDS=/var/lib/jobarchive install