From 6c1b3e2424d2c055260879cae82d0da4e94cf8bb Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Thu, 11 May 2017 09:13:38 +0200 Subject: [PATCH] clean-up installation process --- makefile.shared | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/makefile.shared b/makefile.shared index 185babe..90d4379 100644 --- a/makefile.shared +++ b/makefile.shared @@ -55,25 +55,9 @@ HEADERS=src/headers/tfm_private.h $(HEADERS_PUB) #END_INS -ifndef LIBPATH - LIBPATH=/usr/lib -endif - -ifndef INCPATH - INCPATH=/usr/include -endif - -ifndef INSTALL_GROUP - GROUP=wheel -else - GROUP=$(INSTALL_GROUP) -endif - -ifndef INSTALL_USER - USER=root -else - USER=$(INSTALL_USER) -endif +DESTDIR ?= /usr/local +LIBPATH ?= $(DESTDIR)/lib +INCPATH ?= $(DESTDIR)/include ifndef LIBNAME LIBNAME=libtfm.la @@ -94,15 +78,15 @@ $(LIBNAME): $(OBJECTS) libtool --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) $(LOBJECTS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION) -export-symbols libtfm.symbols install: $(LIBNAME) - install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH) - libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME) - install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH) - install -g $(GROUP) -o $(USER) $(HEADERS_PUB) $(DESTDIR)$(INCPATH) + install -d $(LIBPATH) + libtool --mode=install install $(LIBNAME) $(LIBPATH)/$(LIBNAME) + install -d $(INCPATH) + install $(HEADERS_PUB) $(INCPATH) HEADER_FILES=$(notdir $(HEADERS_PUB)) uninstall: - libtool --mode=uninstall rm $(DESTDIR)$(LIBPATH)/$(LIBNAME) - rm $(HEADER_FILES:%=$(DESTDIR)$(INCPATH)/%) + libtool --mode=uninstall rm $(LIBPATH)/$(LIBNAME) + rm $(HEADER_FILES:%=$(INCPATH)/%) mtest/mtest: mtest/mtest.c cd mtest ; make mtest