diff options
author | rmax <rmax@noemail.net> | 2004-11-18 02:07:05 (GMT) |
---|---|---|
committer | rmax <rmax@noemail.net> | 2004-11-18 02:07:05 (GMT) |
commit | 718ae1b01ef816f1d619ee3aa29ff679d0970052 (patch) | |
tree | 86ee8a7a88a748b30a8223ce88428550f56682e7 /unix/Makefile.in | |
parent | d8755cfa507ecd3f528802a0e9dc7f35ec28b065 (diff) | |
download | tcl-718ae1b01ef816f1d619ee3aa29ff679d0970052.zip tcl-718ae1b01ef816f1d619ee3aa29ff679d0970052.tar.gz tcl-718ae1b01ef816f1d619ee3aa29ff679d0970052.tar.bz2 |
2004-11-18 Reinhard Max <max@suse.de>
* unix/tcl.m4 (SC_CONFIG_MANPAGES): Applied an improved version of
* unix/configure.in: patch #996085, that introduces
* unix/Makefile.in: --enable-man-suffix.
* unix/installManPage: added
* unix/mkLinks.tcl: removed
* unix/mkLinks: removed
FossilOrigin-Name: 3a48a79704ca578128fa5cea83fd8c992e9978fb
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 d4c92d8..6c1485a 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.121.2.7 2004/11/16 23:39:51 andreas_kupries Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.121.2.8 2004/11/18 02:07:09 rmax Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -257,9 +257,9 @@ TCL_BUILDTIME_LIBRARY = @TCL_SRC_DIR@/library CC = @CC@ #CC = purify -best-effort @CC@ -DPURIFY -# 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@ #---------------------------------------------------------------- # The information below is usually usable as is. The configure @@ -682,8 +682,8 @@ install-libraries: libraries done; install-doc: 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 \ @@ -694,36 +694,20 @@ install-doc: doc else true; \ fi; \ done; - @echo "Installing top-level (.1) docs"; - @cd $(TOP_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 $(TOP_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 C API (.3) docs"; - @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN3_INSTALL_DIR) - @echo "Installing command (.n) docs"; - @cd $(TOP_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 $(DLTEST_DIR)/Makefile.in $(SHELL) config.status @@ -1198,11 +1182,6 @@ rpm: all /bin/rpm mv RPMS/i386/*.rpm . rm -rf RPMS THIS.TCL.SPEC -mklinks: - $(TCL_EXE) $(UNIX_DIR)/mkLinks.tcl \ - $(UNIX_DIR)/../doc/*.[13n] > $(UNIX_DIR)/mkLinks - chmod +x $(UNIX_DIR)/mkLinks - # # Target to create a proper Tcl distribution from information in the # master source directory. DISTDIR must be defined to indicate where @@ -1214,7 +1193,7 @@ DISTNAME = tcl${VERSION}${PATCH_LEVEL} ZIPNAME = tcl${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip DISTDIR = $(DISTROOT)/$(DISTNAME) -dist: mklinks +dist: rm -rf $(DISTDIR) mkdir -p $(DISTDIR)/unix cp -p $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix @@ -1224,7 +1203,7 @@ dist: mklinks $(UNIX_DIR)/tcl.m4 $(UNIX_DIR)/aclocal.m4 \ $(UNIX_DIR)/tclConfig.sh.in $(UNIX_DIR)/install-sh \ $(UNIX_DIR)/README $(UNIX_DIR)/ldAix $(UNIX_DIR)/tcl.spec \ - $(UNIX_DIR)/mkLinks \ + $(UNIX_DIR)/installManPage \ $(DISTDIR)/unix chmod 775 $(DISTDIR)/unix/configure $(DISTDIR)/unix/configure.in chmod 775 $(DISTDIR)/unix/ldAix |