Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=9a612596949... Commit: 9a6125969490e49cd843b02feb23de1fc53c94ad Parent: c9186e3cf1b9c7aa5305fccdddc82f6bf75a8694 Author: David Teigland teigland@redhat.com AuthorDate: Wed Oct 5 16:48:07 2011 -0500 Committer: David Teigland teigland@redhat.com CommitterDate: Wed Oct 5 16:48:07 2011 -0500
Makefiles: more munging
--- dlm_controld/Makefile | 16 +++++++++------- dlm_tool/Makefile | 9 +++++---- 2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile index d83ead8..25b1ea4 100644 --- a/dlm_controld/Makefile +++ b/dlm_controld/Makefile @@ -1,3 +1,12 @@ +DESTDIR= +PREFIX=/usr +LIBNUM=/lib64 +BINDIR=$(PREFIX)/sbin +LIBDIR=$(PREFIX)/$(LIBNUM) +HDRDIR=$(PREFIX)/include +MANDIR=$(PREFIX)/share/man +INIDIR=/etc/init.d + BIN_TARGET = dlm_controld
MAN_TARGET = dlm_controld.8 @@ -76,13 +85,6 @@ clean:
INSTALL=$(shell which install)
-DESTDIR= -BINDIR=/usr/sbin -LIBDIR=/usr/lib64 -HDRDIR=/usr/include -MANDIR=/usr/share/man -INIDIR=/etc/init.d - .PHONY: install install: all $(INSTALL) -d $(DESTDIR)/$(BINDIR) diff --git a/dlm_tool/Makefile b/dlm_tool/Makefile index f2cd4b6..b4f65bb 100644 --- a/dlm_tool/Makefile +++ b/dlm_tool/Makefile @@ -1,3 +1,8 @@ +DESTDIR= +PREFIX=/usr +BINDIR=$(PREFIX)/sbin +MANDIR=$(PREFIX)/share/man + BIN_TARGET = dlm_tool MAN_TARGET = dlm_tool.8
@@ -41,10 +46,6 @@ clean:
INSTALL=$(shell which install)
-DESTDIR= -BINDIR=/usr/sbin -MANDIR=/usr/share/man - .PHONY: install install: all $(INSTALL) -d $(DESTDIR)/$(BINDIR)
cluster-commits@lists.stg.fedorahosted.org