diff options
| author | Simon Horman <horms@verge.net.au> | 2010-07-29 15:34:13 +0900 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2010-07-29 15:34:13 +0900 |
| commit | 0775c60eb01831209d80f26f71ac0afde0d6593a (patch) | |
| tree | 673de3d551cdbd93bcee943532ee5df28d55bbc2 /Makefile.in | |
| parent | ff616d864c11a821c5e9acf00474665c4cb402b9 (diff) | |
Install man pages
Ensure that the man pages are built (end up in build/) so that they get
installed.
* Use variables set in kexec/Makefile and kdump/Makefile for the
correct lotion of the "built" man pages.
* For consistency, use variables set in kexec/Makefile and kdump/Makefile
for the location of built binaries too
* Use = instead of := for TARGETS and the variables that comprise it
so that they are re-evaluated after kexec/Makefile and kdump/Makefile
are sourced
* Move setting of various variables and the building of targets to below
the inclusion of kexec/Makefile and kdump/Makefile. This seems to be
necessary for $(TARGETS) to be correctly evaluated when used as a source.
* Make sure all remains the first target without moving more rules
than necessary to below where kexec/Makefile and kdump/Makefile -
I'm concerned about unexpected consequences.
The kexec-tools build system is a bit special.
Reported-by: Marcus Watts <mdw@umich.edu>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index cc4f8d3..4d193b1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -104,15 +104,7 @@ PKGDATADIR=$(DATADIR)/$(PACKAGE_NAME) PKGLIBDIR=$(LIBDIR)/$(PACKAGE_NAME) PKGINCLUDEIR=$(INCLUDEDIR)/$(PACKAGE_NAME) -MAN_PAGES:= kexec/kexec.8 -MAN_PAGES+= kdump/kdump.8 -BINARIES_i386:= $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test -BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test -BINARIES:=$(SBINDIR)/kexec $(SBINDIR)/kdump $(BINARIES_$(ARCH)) - -TARGETS:=$(BINARIES) $(MAN_PAGES) - -all: $(TARGETS) +all: targets # generic build rules %.o: %.c @@ -179,6 +171,15 @@ SRCS:= $(dist) PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) PGSRCS:=$(foreach s, $(GENERATED_SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) +MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) +BINARIES_i386:=$(KEXEC_TEST) $(KEXEC_TEST) +BINARIES_x86_64:=$(KEXEC) $(KDUMP) $(BINARIES_$(ARCH)) +BINARIES:=$(KEXEC) $(KDUMP) $(BINARIES_$(ARCH)) + +TARGETS:=$(BINARIES) $(MAN_PAGES) + +targets: $(TARGETS) + Makefile: Makefile.in config.status ./config.status @@ -315,5 +316,5 @@ install: $(TARGETS) fi; \ done -.PHONY: echo install all clean dist-clean distclean maintainer-clean \ - maintainerclean tarball rpm +.PHONY: echo install all targets clean dist-clean distclean \ + maintainer-clean maintainerclean tarball rpm |