Changeset 978 for branches/1.2/Makefile

Timestamp:

08/21/15 10:28:03 (9 years ago)

Author:

olahaye

Message:

[rpm build] Avoid using fakeroot to build rpm packages.

File:

• branches/1.2/Makefile (modified) (3 diffs)

branches/1.2/Makefile

@@ -77 +77 @@
         @ls -1 ../jobmonarch*$(VERSION)*.deb
 
-install:  ${REQUIRED}
+install:  install-files install-perms
+
+install-files:  ${REQUIRED}
         @#
         @# Set the correct GANGLIA_PATH.
@@ -154 +156 @@
         @echo "Installing Ganglia web interface to $(GANGLIA_ROOT) ."
         @install -m 0755 -d $(DESTDIR)$(GANGLIA_ROOT)
-        @chown -R $(GANGLIA_USER) ./web
-        @chown $(HTTPD_USER) ./web/addons/job_monarch/dwoo/compiled
-        @chown $(HTTPD_USER) ./web/addons/job_monarch/dwoo/cache
         @chmod 775 ./web/addons/job_monarch/dwoo/cache
         @(cd web; rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php ./addons ./templates $(DESTDIR)$(GANGLIA_ROOT)/)
@@ -163 +162 @@
         @echo "Installation complete."
         @echo
+
+install-perms:
+        @chown -R $(GANGLIA_USER) $(DESTDIR)$(GANGLIA_ROOT)
+        @chown $(HTTPD_USER) $(DESTDIR)$(GANGLIA_ROOT)/addons/job_monarch/dwoo/compiled
+        @chown $(HTTPD_USER) $(DESTDIR)$(GANGLIA_ROOT)/addons/job_monarch/dwoo/cache
 
 clean: