diff --git a/Makefile b/Makefile index 48cd0d6..4213414 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ HDR_INSTALL= \ PREFIX_CONFIG=$(PREFIX_SHR)$(PACKAGE_DIR)config/ PACKAGE_INSTALL_LIB=$(DESTDIR)$(PREFIX_CONFIG) LIB_INSTALL=$(wildcard config/check*.c) -SHR_INSTALL= README.md +DOC_INSTALL= README.md AUTHORS NEWS TESTS=example/ # Make sure we generate the config.system @@ -59,6 +59,7 @@ $(PREFIX_LIB:%=PREFIX_LIB?="$(PREFIX_LIB)") \ $(PREFIX_DLL:%=PREFIX_DLL?="$(PREFIX_DLL)") \ $(PREFIX_LIBEXEC:%=PREFIX_LIBEXEC?="$(PREFIX_LIBEXEC)") \ $(PREFIX_MAN:%=PREFIX_MAN?="$(PREFIX_MAN)") \ +$(PREFIX_DOC:%=PREFIX_DOC?="$(PREFIX_DOC)") \ $(PREFIX_VAR:%=PREFIX_VAR?="$(PREFIX_VAR)") \ CONFIG_SOURCES="$(PREFIX_CONFIG)" diff --git a/config.gnu.mk b/config.gnu.mk index 5ae65e1..0a97d69 100644 --- a/config.gnu.mk +++ b/config.gnu.mk @@ -40,6 +40,7 @@ INSTALL_HDR= $(INSTALL_DATA) INSTALL_SHR= $(INSTALL_DATA) INSTALL_LIB= $(INSTALL) INSTALL_MAN= $(INSTALL_DATA) +INSTALL_DOC= $(INSTALL_DATA) INSTALL_ETC= $(INSTALL_DATA) UNINSTALL= /bin/rm -f UNINSTALL_DIR= /bin/rmdir > /dev/null 2>&1 diff --git a/config.mk b/config.mk index 2e885d5..c03cdee 100644 --- a/config.mk +++ b/config.mk @@ -101,6 +101,7 @@ PREFIX_DLL?=$(PREFIX_LIB) PREFIX_HDR?=$(PREFIX)include/ PREFIX_SHR?=$(PREFIX)share/ PREFIX_MAN?=$(PREFIX_SHR)man/ +PREFIX_DOC?=$(PREFIX_SHR)doc/ PREFIX_VAR?=$(PREFIX)var/ # Package configuration directories by default @@ -113,6 +114,7 @@ PACKAGE_INSTALL_DLL?=$(DESTDIR)$(PREFIX_DLL) PACKAGE_INSTALL_HDR?=$(DESTDIR)$(PREFIX_HDR)$(PACKAGE_DIR) PACKAGE_INSTALL_SHR?=$(DESTDIR)$(PREFIX_SHR)$(PACKAGE_DIR) PACKAGE_INSTALL_MAN?=$(DESTDIR)$(PREFIX_MAN) +PACKAGE_INSTALL_DOC?=$(DESTDIR)$(PREFIX_DOC)$(PACKAGE_DIR) PACKAGE_INSTALL_PKGCONFIG?=$(DESTDIR)$(PREFIX_SHR)pkgconfig/ PACKAGE_INSTALL_SYSCONFIG?=$(DESTDIR)$(SYSCONFIG)$(PACKAGE_DIR) diff --git a/make-it-quick.spec b/make-it-quick.spec index 7f8d33c..98e3f42 100644 --- a/make-it-quick.spec +++ b/make-it-quick.spec @@ -21,13 +21,12 @@ can be used to rapidly build C and C++ programs. %build %configure %make_build COLORIZE= TARGET=release -%make_build COLORIZE= AUTHORS NEWS %check %make_build COLORIZE= TARGET=release check %install -%make_install COLORIZE= TARGET=release +%make_install COLORIZE= TARGET=release DOC_INSTALL= %files %doc README.md diff --git a/rules.mk b/rules.mk index 209b5a9..d00a735 100644 --- a/rules.mk +++ b/rules.mk @@ -82,6 +82,7 @@ MIQ_INSTALL= $(TO_INSTALL:%=%.$(DO_INSTALL)) \ $(HEADERS:%=%.$(DO_INSTALL)_hdr) \ $(HDR_INSTALL:%=%.$(DO_INSTALL)_hdr) \ $(SHR_INSTALL:%=%.$(DO_INSTALL)_shr) \ + $(DOC_INSTALL:%=%.$(DO_INSTALL)_doc) \ $(MANPAGES:%=%.gz.$(DO_INSTALL)_man) \ $(MAN_INSTALL:%=%.gz.$(DO_INSTALL)_man) \ $(ETC_INSTALL:%=%.$(DO_INSTALL)_etc) \ @@ -637,6 +638,8 @@ benchmark: $(BENCHMARKS:%=%.benchmark) %.install_man: $(PACKAGE_INSTALL_MAN).mkdir-only % $(PRINT_COMMAND) $(MKDIR) -p $(MIQ_MANDIR) $(PRINT_INSTALL) $(INSTALL_MAN) $* $(MIQ_MANDIR) +%.install_doc: $(PACKAGE_INSTALL_DOC).mkdir-only % + $(PRINT_INSTALL) $(INSTALL_DOC) $* $(PACKAGE_INSTALL_DOC) %.install_etc: $(PACKAGE_INSTALL_SYSCONFIG).mkdir-only % $(PRINT_INSTALL) $(INSTALL_ETC) $* $(PACKAGE_INSTALL_SYSCONFIG) %.install_pc: $(PACKAGE_INSTALL_PKGCONFIG).mkdir-only % @@ -655,6 +658,8 @@ benchmark: $(BENCHMARKS:%=%.benchmark) $(PRINT_UNINSTALL) $(UNINSTALL) $(*F:%=$(PACKAGE_INSTALL_HDR)%) ; $(UNINSTALL_DIR) $(PACKAGE_INSTALL_HDR) $(UNINSTALL_OK) %.uninstall_shr: $(PRINT_UNINSTALL) $(UNINSTALL) $(*F:%=$(PACKAGE_INSTALL_SHR)%) ; $(UNINSTALL_DIR) $(PACKAGE_INSTALL_SHR) $(UNINSTALL_OK) +%.uninstall_doc: + $(PRINT_UNINSTALL) $(UNINSTALL) $(*F:%=$(PACKAGE_INSTALL_DOC)%) ; $(UNINSTALL_DIR) $(PACKAGE_INSTALL_DOC) $(UNINSTALL_OK) %.uninstall_man: $(PRINT_UNINSTALL) $(UNINSTALL) $(*F:%=$(PACKAGE_INSTALL_MAN)%) %.uninstall_etc: