From 2edb06ce628537c629b2d41c20acd51b309502f8 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Sat, 7 Apr 2007 10:16:52 +0000 Subject: [PATCH] 2007-04-07 Chris Sutcliffe * Makefile.in: Removed mansuffix variable. Changed mansection to support Cygwin man page location. --- winsup/mingw/ChangeLog | 9 +++++++-- winsup/mingw/Makefile.in | 18 ++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index b9a28c6d4..a61a498b1 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,7 +1,12 @@ +2007-04-07 Chris Sutcliffe + + * Makefile.in: Removed mansuffix variable. Changed mansection to support + Cygwin man page location. + 2007-04-05 Chris Sutcliffe - * Makefile.in: Added mansection and mansuffix variables. Changed mandir - to support Cygwin man page location. + * Makefile.in: Added mansection and mansuffix variables. Changed mandir to + support Cygwin man page location. 2007-03-25 Chris Sutcliffe diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in index a90bfe1b1..8958aee8f 100644 --- a/winsup/mingw/Makefile.in +++ b/winsup/mingw/Makefile.in @@ -19,7 +19,7 @@ PACKAGE = mingw-runtime VERSION = @PACKAGE_VERSION@ -CYGRELEASE = 2 +CYGRELEASE = 3 VPATH = @srcdir@ srcdir = @srcdir@ @@ -39,11 +39,9 @@ libdir = @libdir@ ifneq (,$(findstring cygwin,$(target_alias))) mandir = $(prefix)/share/man mansection = mingw -mansuffix = mingw else mandir = @mandir@ -mansection = man3 -mansuffix = 3 +mansection = 3 endif manpage_transform = @mingw_manpage_transform@ ifeq ($(target_alias),$(host_alias)) @@ -429,7 +427,7 @@ install-dirs: $(mkinstalldirs) $(inst_includedir) $(mkinstalldirs) $(inst_libdir) $(mkinstalldirs) $(inst_docdir) - $(mkinstalldirs) $(mandir)/$(mansection) + $(mkinstalldirs) $(mandir)/man$(mansection) install: all install-dirs $(install_dlls_host) for i in $(LIBS); do \ @@ -452,11 +450,11 @@ install: all install-dirs $(install_dlls_host) # This provisional hack installs the only manpage we have at present... # It simply CANNOT suffice, when we have more manpages to ship. # - $(mkinstalldirs) $(mandir)/$(mansection) - $(INSTALL_DATA) $(srcdir)/man/dirname.man $(mandir)/$(mansection)/`\ - echo dirname.man|sed '$(manpage_transform);s,man$$,$(mansuffix),'` - $(INSTALL_DATA) $(srcdir)/man/dirname.man $(mandir)/$(mansection)/`\ - echo basename.man|sed '$(manpage_transform);s,man$$,$(mansuffix),'` + $(mkinstalldirs) $(mandir)/man$(mansection) + $(INSTALL_DATA) $(srcdir)/man/dirname.man $(mandir)/man$(mansection)/`\ + echo dirname.man|sed '$(manpage_transform);s,man$$,$(mansection),'` + $(INSTALL_DATA) $(srcdir)/man/dirname.man $(mandir)/man$(mansection)/`\ + echo basename.man|sed '$(manpage_transform);s,man$$,$(mansection),'` # # End provisional hack. #