diff options
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 63 |
1 files changed, 21 insertions, 42 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 8b53e26..e21fdbf 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.87.2.4 2004/10/26 23:23:14 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.87.2.5 2004/11/18 02:08:59 rmax Exp $ # Current Tk version; used in various names. @@ -270,9 +270,9 @@ TOOL_DIR = @TCL_SRC_DIR@/tools # either. #---------------------------------------------------------------- -# Flags to be passed to mkLinks to control whether the manpages +# Flags to be passed to installManPage to control whether the manpages # should be compressed and linked with softlinks -MKLINKS_FLAGS = @MKLINKS_FLAGS@ +MAN_FLAGS = @MAN_FLAGS@ CC = @CC@ @@ -628,8 +628,8 @@ install-demos: done; install-doc: - @if test ! -x $(UNIX_DIR)/mkLinks; then \ - chmod +x $(UNIX_DIR)/mkLinks; \ + @if test ! -x $(UNIX_DIR)/installManPage; then \ + chmod +x $(UNIX_DIR)/installManPage; \ fi @for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \ do \ @@ -640,36 +640,20 @@ install-doc: else true; \ fi; \ done; - @echo "Installing top-level (.1) docs"; - @cd $(SRC_DIR)/doc; for i in *.1; \ - do \ - rm -f $(MAN1_INSTALL_DIR)/$$i; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ - $$i > $(MAN1_INSTALL_DIR)/$$i; \ - chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking top-level (.1) docs"; - @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN1_INSTALL_DIR) - @echo "Installing C API (.3) docs"; - @cd $(SRC_DIR)/doc; for i in *.3; \ - do \ - rm -f $(MAN3_INSTALL_DIR)/$$i; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ - $$i > $(MAN3_INSTALL_DIR)/$$i; \ - chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking top-level (.3) docs"; - @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN3_INSTALL_DIR) - @echo "Installing command (.n) docs"; - @cd $(SRC_DIR)/doc; for i in *.n; \ - do \ - rm -f $(MANN_INSTALL_DIR)/$$i; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ - $$i > $(MANN_INSTALL_DIR)/$$i; \ - chmod 444 $(MANN_INSTALL_DIR)/$$i; \ - done; - @echo "Cross-linking command (.n) docs"; - @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR) + @echo "Installing and cross-linking top-level (.1) docs"; + @cd $(TOP_DIR)/doc; for i in *.1; do \ + $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \ + done + + @echo "Installing and cross-linking C API (.3) docs"; + @cd $(TOP_DIR)/doc; for i in *.3; do \ + $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \ + done + + @echo "Installing and cross-linking command (.n) docs"; + @cd $(TOP_DIR)/doc; for i in *.n; do \ + $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \ + done Makefile: $(UNIX_DIR)/Makefile.in $(SHELL) config.status @@ -1056,11 +1040,6 @@ rpm: all /bin/rpm mv RPMS/i386/*.rpm . rm -rf RPMS THIS.TK.SPEC -mklinks: - $(TCL_EXE) $(TCLDIR)/unix/mkLinks.tcl \ - $(UNIX_DIR)/../doc/*.[13n] > $(UNIX_DIR)/mkLinks - chmod +x $(UNIX_DIR)/mkLinks - # # Target to create a proper Tk distribution from information in the # master source directory. DISTDIR must be defined to indicate where @@ -1073,7 +1052,7 @@ ZIPNAME = tk${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip DISTDIR = $(DISTROOT)/$(DISTNAME) TCLDIR = @TCL_SRC_DIR@ -dist: mklinks +dist: rm -rf $(DISTDIR) mkdir -p $(DISTDIR) mkdir $(DISTDIR)/unix @@ -1083,7 +1062,7 @@ dist: mklinks cp $(UNIX_DIR)/configure $(UNIX_DIR)/configure.in $(UNIX_DIR)/tk.spec \ $(UNIX_DIR)/aclocal.m4 $(UNIX_DIR)/tcl.m4 \ $(UNIX_DIR)/tkConfig.sh.in $(TCLDIR)/unix/install-sh \ - $(UNIX_DIR)/README $(UNIX_DIR)/mkLinks $(DISTDIR)/unix + $(UNIX_DIR)/README $(UNIX_DIR)/installManPage $(DISTDIR)/unix chmod 775 $(DISTDIR)/unix/configure $(DISTDIR)/unix/configure.in chmod +x $(DISTDIR)/unix/install-sh mkdir $(DISTDIR)/bitmaps |