From Jay St. Pierre <Jay.St.Pierre@colorado.edu>:

        * itcl/Makefile.in (install-doc): Install man.macros properly into
        man pages when installing.
        * itk/Makefile.in (install-doc): Likewise.

diff --git a/itcl/ChangeLog b/itcl/ChangeLog
index c678235..46a994c 100644 (file)
--- a/itcl/ChangeLog
+++ b/itcl/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-31  Keith Seitz  <keiths@redhat.com>
+
+       From Jay St. Pierre <Jay.St.Pierre@colorado.edu>:
+       * itcl/Makefile.in (install-doc): Install man.macros properly into
+       man pages when installing.
+       * itk/Makefile.in (install-doc): Likewise.
+
 2001-09-06  David Gravereaux <davygrvy@pobox.com>
 
        * itcl/generic/itcl_util.c: Threading patch from "Haneef Mohammed"

diff --git a/itcl/itcl/Makefile.in b/itcl/itcl/Makefile.in
index 060e096..4296943 100644 (file)
--- a/itcl/itcl/Makefile.in
+++ b/itcl/itcl/Makefile.in
@@ -292,10 +292,12 @@ install-libraries: libraries
 install-doc: doc
        $(mkinstalldirs) $(mandir)/mann
        @echo "Installing man pages in $(mandir)"
-       @for i in $(srcdir)/doc/*.n; \
+       @cd $(srcdir)/doc; for i in *.n; \
            do \
            echo "Installing $$i"; \
-           $(INSTALL_DATA) $$i $(mandir)/mann ; \
+           sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
+               $$i > $(mandir)/mann/$$i; \
+           chmod 444 $(mandir)/mann/$$i; \
            done
 
 test: $(TCLSH_PROG)

diff --git a/itcl/itk/Makefile.in b/itcl/itk/Makefile.in
index c69f4f4..f91e570 100644 (file)
--- a/itcl/itk/Makefile.in
+++ b/itcl/itk/Makefile.in
@@ -287,10 +287,12 @@ install-libraries: libraries
 install-doc: doc
        $(mkinstalldirs) $(mandir)/mann
        @echo "Installing man pages in $(mandir)"
-       @for i in $(srcdir)/doc/*.n; \
+       @cd $(srcdir)/doc; for i in *.n; \
            do \
            echo "Installing $$i info $(mandir)/mann"; \
-           $(INSTALL_DATA) $$i $(mandir)/mann ; \
+           sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
+               $$i > $(mandir)/mann/$$i; \
+           chmod 444 $(mandir)/mann/$$i; \
            done
 
 test: $(TCLSH_PROG)