components/tcl/tcl/patches/2.makefile.patch
author Srinivasa Sarva <srinivasa.sarva@oracle.com>
Tue, 10 May 2011 17:39:30 -0700
changeset 225 2f3e03a69313
parent 175 5195b4ea17ad
permissions -rw-r--r--
7040199 Update tcl to 8.5.9 7040201 Move tk to Userland 7040202 Move expect to userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
225
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
     1
--- tcl8.5.9/unix/Makefile.in.~1~	Wed Sep  8 10:40:48 2010
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
     2
+++ tcl8.5.9/unix/Makefile.in	Wed Apr 13 20:53:04 2011
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
     3
@@ -69,10 +69,10 @@
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
     4
 MAN1_INSTALL_DIR	= $(MAN_INSTALL_DIR)/man1
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
     5
 
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
     6
 # Directory in which to install manual entries for Tcl's C library procedures:
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
     7
-MAN3_INSTALL_DIR	= $(MAN_INSTALL_DIR)/man3
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
     8
+MAN3TCL_INSTALL_DIR   = $(MAN_INSTALL_DIR)/man3tcl
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
     9
 
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    10
 # Directory in which to install manual entries for the built-in Tcl commands:
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    11
-MANN_INSTALL_DIR	= $(MAN_INSTALL_DIR)/mann
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    12
+MAN1T_INSTALL_DIR     = $(MAN_INSTALL_DIR)/man1t
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    13
 
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    14
 # Path to the html documentation dir:
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    15
 HTML_DIR		= @HTML_DIR@
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    16
@@ -264,7 +264,7 @@
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    17
 
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    18
 APP_CC_SWITCHES = $(CC_SWITCHES) @EXTRA_APP_CC_SWITCHES@
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    19
 
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    20
-LIBS		= @TCL_LIBS@
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    21
+LIBS		= @TCL_LIBS@ -lc
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    22
 
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    23
 DEPEND_SWITCHES	= ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    24
 ${AC_FLAGS} ${PROTO_FLAGS} ${EXTRA_CFLAGS} @EXTRA_CC_SWITCHES@
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    25
@@ -820,7 +820,7 @@
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    26
 	    $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    27
 
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    28
 install-doc: doc
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    29
-	@for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    30
+	@for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3TCL_INSTALL_DIR)" "$(MAN1T_INSTALL_DIR)" ; \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    31
 	    do \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    32
 	    if [ ! -d "$$i" ] ; then \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    33
 		echo "Making directory $$i"; \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    34
@@ -833,17 +833,18 @@
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    35
 	@for i in $(TOP_DIR)/doc/*.1; do \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    36
 	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    37
 	done
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    38
-
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    39
-	@echo "Installing and cross-linking C API (.3) docs";
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    40
-	@for i in $(TOP_DIR)/doc/*.3; do \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    41
-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    42
+	
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    43
+	@echo "Installing and cross-linking C API (.3tcl) docs";
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    44
+	@for i in $(TOP_DIR)/doc/*.3tcl; do \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    45
+	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3TCL_INSTALL_DIR)"; \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    46
 	done
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    47
-
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    48
-	@echo "Installing and cross-linking command (.n) docs";
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    49
-	@for i in $(TOP_DIR)/doc/*.n; do \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    50
-	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    51
+	
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    52
+	@echo "Installing and cross-linking command (.1t) docs";
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    53
+	@for i in $(TOP_DIR)/doc/*.1t; do \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    54
+	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1T_INSTALL_DIR)"; \
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    55
 	done
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    56
 
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    57
+
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    58
 # Optional target to install private headers
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    59
 install-private-headers: libraries
2f3e03a69313 7040199 Update tcl to 8.5.9
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 175
diff changeset
    60
 	@for i in "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \