diff --git a/makefile b/makefile index 7cff821..792383e 100644 --- a/makefile +++ b/makefile @@ -289,14 +289,16 @@ endif ifndef NODOCS install: library docs else -install: library +install: library $(USEFUL_DEMOS) endif install -d $(LIBPATH) install -d $(INCPATH) - install -d $(DATAPATH) + install -d $(BINPATH) install -m 644 $(LIBNAME) $(LIBPATH) install -m 644 $(HEADERS) $(INCPATH) + install -m 644 $(USEFUL_DEMOS) $(BINPATH) ifndef NODOCS + install -d $(DATAPATH) install -m 644 doc/crypt.pdf $(DATAPATH) endif diff --git a/makefile.include b/makefile.include index 5dadaba..c1cd7d5 100644 --- a/makefile.include +++ b/makefile.include @@ -96,10 +96,12 @@ TESTS=demos/test.o #LIBPATH The directory for libtomcrypt to be installed to. #INCPATH The directory to install the header files for libtomcrypt. #DATAPATH The directory to install the pdf docs. +#BINPATH The directory to install the binaries provided. DESTDIR ?= /usr/local LIBPATH ?= $(DESTDIR)/lib INCPATH ?= $(DESTDIR)/include DATAPATH ?= $(DESTDIR)/share/doc/libtomcrypt/pdf +BINPATH ?= $(DESTDIR)/bin #Who do we install as? ifdef INSTALL_USER diff --git a/makefile.shared b/makefile.shared index 3e888c5..1506ba7 100644 --- a/makefile.shared +++ b/makefile.shared @@ -234,11 +234,13 @@ $(LIBNAME): $(OBJECTS) $(LIBTEST): $(TOBJECTS) $(LT) --mode=link --tag=CC $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) `find ./testprof -type f -name "*.lo"` -o $@ -rpath $(LIBPATH) -version-info $(VERSION_LT) -install: $(LIBNAME) +install: $(LIBNAME) $(USEFUL_DEMOS) install -d $(LIBPATH)/pkgconfig install -d $(INCPATH) + install -d $(BINPATH) $(LT) --mode=install install -c $(LIBNAME) $(LIBPATH)/$(LIBNAME) install -m 644 $(HEADERS) $(INCPATH) + install -m 775 $(USEFUL_DEMOS) $(BINPATH) sed -e 's,^prefix=.*,prefix=$(DESTDIR),' -e 's,^Version:.*,Version: $(VERSION),' libtomcrypt.pc.in > $(LIBPATH)/pkgconfig/libtomcrypt.pc install -m 644 libtomcrypt.pc $(LIBPATH)/pkgconfig/libtomcrypt.pc