Changeset 919 for branches

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

Files:

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

branches/1.0/Makefile

@@ -95 +95 @@
         @echo
         @echo "Installing jobmond.py and jobarchived.py to $(PREFIX)/sbin"
-        @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
+        @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)
+        @#
+        @# Files in /etc
+        @#
+        @echo
+        @echo "Installing config files jobmond.conf jobarchived.conf in /etc"
+        @install -m 0755 -d $(DESTDIR)/etc
+        @install -m 0644 jobmond/jobmond.conf $(DESTDIR)/etc/
+        @install -m 0644 jobarchived/jobarchived.conf $(DESTDIR)/etc/
         @#
         @# Files specific to distros if /etc/redhat-release => rpm else (/etc/debian_version => debian)
         @#
-        @echo
-        @echo "Installing service files in /etc"
-        @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 \
+                echo; \
+                echo "Red Hat detected: installing RPM service files in /etc"; \
+                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; \
                 install -m 0755 -d $(DESTDIR)/etc/rc.d/init.d; \
                 install -m 0755 pkg/rpm/init.d/jobmond $(DESTDIR)/etc/rc.d/init.d/; \
@@ -115 +121 @@
                 install -m 0755 pkg/rpm/sysconfig/jobmond $(DESTDIR)/etc/sysconfig; \
                 install -m 0755 pkg/rpm/sysconfig/jobarchived $(DESTDIR)/etc/sysconfig; \
-        else \
-                install -m 0755 -d $(DESTDIR)/etc/init.d; \
-                install -m 0755 pkg/deb/init.d/jobmond $(DESTDIR)/etc/init.d/; \
-                install -m 0755 pkg/deb/init.d/jobarchived $(DESTDIR)/etc/init.d/; \
-                install -m 0755 -d $(DESTDIR)/etc/default; \
-                install -m 0755 pkg/deb/default/jobmond $(DESTDIR)/etc/default; \
-                install -m 0755 pkg/deb/default/jobarchived $(DESTDIR)/etc/default; \
+    else \
+                sed -i -e 's|DAEMON=.*|DAEMON=$(JOBMOND)|g' debian/jobmonarch-jobmond.init; \
+                sed -i -e 's|DAEMON=.*|DAEMON=$(JOBARCHIVED)|g' debian/jobmonarch-jobarchived.init; \
         fi
-        @#
-        @# Files in /etc
-        @#
-        @echo
-        @echo "Installing config files jobmond.conf jobarchived.conf in /etc"
-        @install -m 0644 jobmond/jobmond.conf $(DESTDIR)/etc
-        @install -m 0644 jobarchived/jobarchived.conf $(DESTDIR)/etc
         @#
         @# Files in /usr/share

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