|
 |
d4b3a3a |
From 7ab35273917c5e6a9fa3d528053d146e32013def Mon Sep 17 00:00:00 2001
|
|
|
d4b3a3a |
From: Terje Rosten <terje.rosten@ntnu.no>
|
|
|
d4b3a3a |
Date: Sun, 2 Feb 2020 09:58:43 +0100
|
|
|
d4b3a3a |
Subject: [PATCH] Fix paths
|
|
|
d4b3a3a |
|
|
|
d4b3a3a |
---
|
|
|
d4b3a3a |
Makefile | 7 +++----
|
|
|
d4b3a3a |
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
d4b3a3a |
|
|
|
936bf08 |
diff --git a/Makefile b/Makefile
|
|
|
d4b3a3a |
index 2d04cd9..7a6d5fd 100644
|
|
|
936bf08 |
--- a/Makefile
|
|
|
936bf08 |
+++ b/Makefile
|
|
|
936bf08 |
@@ -2,10 +2,10 @@
|
|
|
936bf08 |
# User configurables:
|
|
|
936bf08 |
##########################################################
|
|
|
936bf08 |
# Location where gweb should be installed to (excluding conf, dwoo dirs).
|
|
|
936bf08 |
-GDESTDIR = /usr/share/ganglia-webfrontend
|
|
|
936bf08 |
+GDESTDIR = /usr/share/ganglia
|
|
|
936bf08 |
|
|
|
936bf08 |
# Location where default apache configuration should be installed to.
|
|
|
936bf08 |
-GCONFDIR = /etc/ganglia-web
|
|
|
936bf08 |
+GCONFDIR = /etc/ganglia
|
|
|
936bf08 |
|
|
|
936bf08 |
# Gweb statedir (where conf dir and Dwoo templates dir are stored)
|
|
|
936bf08 |
GWEB_STATEDIR = /var/lib/ganglia-web
|
|
|
d4b3a3a |
@@ -86,8 +86,7 @@ install: dist-dir
|
|
|
936bf08 |
mkdir -p $(DESTDIR)/$(GWEB_STATEDIR) && \
|
|
|
936bf08 |
rsync -a $(DIST_DIR)/conf $(DESTDIR)/$(GWEB_STATEDIR) && \
|
|
|
936bf08 |
mkdir -p $(DESTDIR)/$(GDESTDIR) && \
|
|
|
936bf08 |
- rsync --exclude "conf" -a $(DIST_DIR)/* $(DESTDIR)/$(GDESTDIR) && \
|
|
|
d4b3a3a |
- chown -R $(APACHE_USER):$(APACHE_GROUP) $(DESTDIR)/$(GWEB_STATEDIR)
|
|
|
936bf08 |
+ rsync --exclude "conf" -a $(DIST_DIR)/* $(DESTDIR)/$(GDESTDIR)
|
|
|
936bf08 |
|
|
|
936bf08 |
dist-gzip: dist-dir
|
|
|
936bf08 |
if [ -f $(DIST_TARBALL) ]; then \
|
|
|
d4b3a3a |
--
|
|
|
d4b3a3a |
2.24.1
|
|
|
d4b3a3a |
|