From 748bab64a777eb3641868fc65b9e7cf625c586b8 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Fri, 30 Dec 2005 00:49:01 +0100 Subject: [PATCH] Make the printed install paths simpler for man5 files when srcdir == builddir --- Makefile.config.in | 6 ++++++ doc/man/man1/Makefile | 2 +- doc/man/man5/Makefile | 2 +- src/intl/gettext/Makefile | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index cfb37945..21ef90ee 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -13,7 +13,13 @@ PATHSCRIPT = case '@top_srcdir@' in /*) ;; *) echo $(top_builddir)/;; esac PATHPREFIX = $(shell $(PATHSCRIPT)) top_srcdir = $(PATHPREFIX)@top_srcdir@ + +SRCPATH = $(shell cd $(top_srcdir)/$(RELPATH) && pwd) +ifeq ($(SRCPATH),$(CURPATH)) +srcdir = +else srcdir = $(top_srcdir)/$(RELPATH) +endif prefix = @prefix@ exec_prefix = @exec_prefix@ diff --git a/doc/man/man1/Makefile b/doc/man/man1/Makefile index 15ca9349..56c1c077 100644 --- a/doc/man/man1/Makefile +++ b/doc/man/man1/Makefile @@ -1,7 +1,7 @@ top_builddir=../../.. include $(top_builddir)/Makefile.config -elinks.1: $(srcdir)/elinks.1.in $(top_srcdir)/configure.in +elinks.1: $(srcdir)elinks.1.in $(top_srcdir)/configure.in cd $(top_builddir) && \ CONFIG_FILES="$(RELPATH)$@" CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/doc/man/man5/Makefile b/doc/man/man5/Makefile index b659a393..607de0b0 100644 --- a/doc/man/man5/Makefile +++ b/doc/man/man5/Makefile @@ -1,6 +1,6 @@ top_builddir=../../.. include $(top_builddir)/Makefile.config -MAN5 = $(srcdir)/elinks.conf.5 $(srcdir)/elinkskeys.5 +MAN5 = $(srcdir)elinks.conf.5 $(srcdir)elinkskeys.5 include $(top_srcdir)/Makefile.lib diff --git a/src/intl/gettext/Makefile b/src/intl/gettext/Makefile index e9f8abb9..82c3f085 100644 --- a/src/intl/gettext/Makefile +++ b/src/intl/gettext/Makefile @@ -26,7 +26,7 @@ OBJS = \ # $(builddir)/charset.alias: $(srcdir)/config.charset -$(builddir)/charset.alias: $(srcdir)/config.charset +$(builddir)/charset.alias: $(srcdir)config.charset $(SHELL) $(srcdir)/config.charset '$(host)' > $@.new mv $@.new $@