From 3c5ec6b6996d03cf032b68d904b6ce9cfacabd0e Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Sun, 7 May 2017 22:30:59 +0200 Subject: [PATCH] split-out binary installation in separate install target --- makefile | 8 +++++--- makefile.shared | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/makefile b/makefile index 70f2c66..283e0ce 100644 --- a/makefile +++ b/makefile @@ -290,19 +290,21 @@ endif ifndef NODOCS install: library docs else -install: library $(USEFUL_DEMOS) +install: library endif install -d $(LIBPATH) install -d $(INCPATH) - 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 +install_bins: $(USEFUL_DEMOS) + install -d $(BINPATH) + install -m 775 $(USEFUL_DEMOS) $(BINPATH) + install_test: $(LIBTEST) install -d $(LIBPATH) install -d $(INCPATH) diff --git a/makefile.shared b/makefile.shared index c14647f..d890b1b 100644 --- a/makefile.shared +++ b/makefile.shared @@ -239,16 +239,18 @@ $(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) $(USEFUL_DEMOS) +install: $(LIBNAME) 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 +install_bins: $(USEFUL_DEMOS) + install -d $(BINPATH) + $(LT) --mode=install install -c $(USEFUL_DEMOS) $(BINPATH) + install_test: $(LIBTEST) install -d $(LIBPATH) install -d $(INCPATH)