From ac8f8e006cf1fe9ead9b11b68883898d08d420c6 Mon Sep 17 00:00:00 2001 From: das Date: Tue, 20 Jul 2004 10:23:51 +0000 Subject: * unix/Makefile.in: * win/Makefile.in: added 'install-private-headers' makefile target to allow optionally installing private tk headers. [Tcl FR 922727] --- unix/Makefile.in | 27 ++++++++++++++++++++++++++- win/Makefile.in | 23 ++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in index c714e8d..663369f 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.94 2004/07/16 23:40:29 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.95 2004/07/20 10:23:51 das Exp $ # Current Tk version; used in various names. @@ -63,6 +63,9 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY) # Directory in which to install the include file tk.h: INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) +# Directory in which to (optionally) install the private tk headers: +PRIVATE_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) + # Top-level directory for manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) @@ -678,6 +681,28 @@ install-doc: @echo "Cross-linking command (.n) docs"; @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR) +# Optional target to install private headers +install-private-headers: + @for i in $(PRIVATE_INCLUDE_INSTALL_DIR); \ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ + mkdir -p $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ + done; + @if test ! -x $(UNIX_DIR)/install-sh; then \ + chmod +x $(UNIX_DIR)/install-sh; \ + fi + @echo "Installing private header files"; + @for i in $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \ + $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \ + $(UNIX_DIR)/tkUnixPort.h $(UNIX_DIR)/tkUnixInt.h ; \ + do \ + $(INSTALL_DATA) $$i $(PRIVATE_INCLUDE_INSTALL_DIR); \ + done; + Makefile: $(UNIX_DIR)/Makefile.in $(SHELL) config.status diff --git a/win/Makefile.in b/win/Makefile.in index 91a5c4f..277a99a 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.61 2004/04/24 06:00:20 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.62 2004/07/20 10:23:51 das Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -56,6 +56,9 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY) # Directory in which to install the include file tk.h: INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) +# Directory in which to (optionally) install the private tk headers: +PRIVATE_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) + # Top-level directory for manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) @@ -526,6 +529,24 @@ install-demos: install-doc: doc +# Optional target to install private headers +install-private-headers: libraries + @for i in $(PRIVATE_INCLUDE_INSTALL_DIR); \ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ + $(MKDIR) $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ + done; + @echo "Installing private header files to $(PRIVATE_INCLUDE_INSTALL_DIR)/"; + @for i in $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \ + $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \ + $(WIN_DIR)/tkWinPort.h $(WIN_DIR)/tkWinInt.h $(WIN_DIR)/tkWin.h; \ + do \ + $(INSTALL_DATA) $$i $(PRIVATE_INCLUDE_INSTALL_DIR); \ + done; $(WISH): $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(WISH_OBJS) wish.$(RES) $(CC) $(CFLAGS) $(WISH_OBJS) $(TCL_LIB_FILE) $(TK_LIB_FILE) $(LIBS) \ -- cgit v0.12