From c5acbc7953ede0bc34608aa1661f1cf26ea2d282 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 16 Sep 2013 08:57:24 +0200 Subject: [PATCH] mk/prog.mk: set MAN to $(BIN).8 by default. --- bin/xbps-create/Makefile | 1 - bin/xbps-dgraph/Makefile | 1 + bin/xbps-install/Makefile | 1 - bin/xbps-pkgdb/Makefile | 2 -- bin/xbps-query/Makefile | 1 - bin/xbps-reconfigure/Makefile | 1 - bin/xbps-remove/Makefile | 1 - bin/xbps-rindex/Makefile | 1 - bin/xbps-uhelper/Makefile | 1 + mk/prog.mk | 1 + 10 files changed, 3 insertions(+), 8 deletions(-) diff --git a/bin/xbps-create/Makefile b/bin/xbps-create/Makefile index 43ac72b6..1e9fd5e0 100644 --- a/bin/xbps-create/Makefile +++ b/bin/xbps-create/Makefile @@ -2,6 +2,5 @@ TOPDIR = ../.. -include $(TOPDIR)/config.mk BIN = xbps-create -MAN = $(BIN).8 include $(TOPDIR)/mk/prog.mk diff --git a/bin/xbps-dgraph/Makefile b/bin/xbps-dgraph/Makefile index 9934c97a..d4084b95 100644 --- a/bin/xbps-dgraph/Makefile +++ b/bin/xbps-dgraph/Makefile @@ -2,5 +2,6 @@ TOPDIR = ../.. -include $(TOPDIR)/config.mk BIN = xbps-dgraph +MAN = include $(TOPDIR)/mk/prog.mk diff --git a/bin/xbps-install/Makefile b/bin/xbps-install/Makefile index 2732aa06..c8a435a8 100644 --- a/bin/xbps-install/Makefile +++ b/bin/xbps-install/Makefile @@ -3,6 +3,5 @@ TOPDIR = ../.. BIN = xbps-install OBJS = main.o transaction.o main.o question.o fetch_cb.o state_cb.o util.o -MAN = $(BIN).8 include $(TOPDIR)/mk/prog.mk diff --git a/bin/xbps-pkgdb/Makefile b/bin/xbps-pkgdb/Makefile index d9d1f390..58e70739 100644 --- a/bin/xbps-pkgdb/Makefile +++ b/bin/xbps-pkgdb/Makefile @@ -7,6 +7,4 @@ OBJS += check_pkg_rundeps.o OBJS += check_pkg_symlinks.o check_pkg_unneeded.o OBJS += convert.o -MAN = $(BIN).8 - include $(TOPDIR)/mk/prog.mk diff --git a/bin/xbps-query/Makefile b/bin/xbps-query/Makefile index 41b37895..23aa3afd 100644 --- a/bin/xbps-query/Makefile +++ b/bin/xbps-query/Makefile @@ -4,6 +4,5 @@ TOPDIR = ../.. BIN = xbps-query OBJS = main.o list.o show-deps.o show-info-files.o OBJS += ownedby.o search.o ../xbps-install/util.o -MAN = $(BIN).8 include $(TOPDIR)/mk/prog.mk diff --git a/bin/xbps-reconfigure/Makefile b/bin/xbps-reconfigure/Makefile index 3f50d931..3cfcde4c 100644 --- a/bin/xbps-reconfigure/Makefile +++ b/bin/xbps-reconfigure/Makefile @@ -2,6 +2,5 @@ TOPDIR = ../.. -include $(TOPDIR)/config.mk BIN = xbps-reconfigure -MAN = $(BIN).8 include $(TOPDIR)/mk/prog.mk diff --git a/bin/xbps-remove/Makefile b/bin/xbps-remove/Makefile index ba22ae15..bf3c3851 100644 --- a/bin/xbps-remove/Makefile +++ b/bin/xbps-remove/Makefile @@ -6,6 +6,5 @@ OBJS = main.o OBJS += ../xbps-install/question.o OBJS += ../xbps-install/util.o OBJS += ../xbps-install/transaction.o -MAN = $(BIN).8 include $(TOPDIR)/mk/prog.mk diff --git a/bin/xbps-rindex/Makefile b/bin/xbps-rindex/Makefile index 7aeb9126..20e7714c 100644 --- a/bin/xbps-rindex/Makefile +++ b/bin/xbps-rindex/Makefile @@ -3,6 +3,5 @@ TOPDIR = ../.. BIN = xbps-rindex OBJS = main.o index-add.o index-clean.o remove-obsoletes.o repoflush.o -MAN = $(BIN).8 include $(TOPDIR)/mk/prog.mk diff --git a/bin/xbps-uhelper/Makefile b/bin/xbps-uhelper/Makefile index 7ccb1539..a3952701 100644 --- a/bin/xbps-uhelper/Makefile +++ b/bin/xbps-uhelper/Makefile @@ -3,5 +3,6 @@ TOPDIR = ../.. BIN = xbps-uhelper OBJS = main.o ../xbps-install/fetch_cb.o +MAN = include $(TOPDIR)/mk/prog.mk diff --git a/mk/prog.mk b/mk/prog.mk index abec0cf3..2e69d096 100644 --- a/mk/prog.mk +++ b/mk/prog.mk @@ -3,6 +3,7 @@ OBJS ?= main.o BINS = $(BIN) +MAN ?= $(BIN).8 ifdef BUILD_STATIC BINS += $(BIN).static