This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
STABLE2 - build: prefer init scripts generated in the objdir ratherthan source
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Fri, 7 Nov 2008 07:33:47 +0000 (UTC)
- Subject: STABLE2 - build: prefer init scripts generated in the objdir ratherthan source
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5019a7902ef1374c382f4d652f5ea433332a668b
Commit: 5019a7902ef1374c382f4d652f5ea433332a668b
Parent: 5e83cdb08b423478a0b6cc8f6de396ab8328d47a
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Wed Nov 5 11:30:39 2008 +0100
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Nov 7 08:31:57 2008 +0100
build: prefer init scripts generated in the objdir rather than source
This avoids a simple problem of building arch foo in objdir and arch bar
in srcdir. Preferring objdir will make sure always to install the
correct ones.
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
make/install.mk | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/make/install.mk b/make/install.mk
index 7d99029..ad9930a 100644
--- a/make/install.mk
+++ b/make/install.mk
@@ -26,10 +26,10 @@ endif
ifdef INITDT
install -d ${initddir}
for i in ${INITDT}; do \
- if [ -f $(S)/$$i ]; then \
- install -m755 $(S)/$$i ${initddir}; \
- else \
+ if [ -f $$i ]; then \
install -m755 $$i ${initddir}; \
+ else \
+ install -m755 $(S)/$$i ${initddir}; \
fi; \
done
endif