Update to 20040128 ten15 snapshot

PR:		62038
Submitted by:	Stefan Farfeleder <stefan@fafoe.narf.at>

1 files changed, 37 insertions, 33 deletions

diff --git a/lang/TenDRA/files/patch-install b/lang/TenDRA/files/patch-install
index d147fe8c9288..c5a4614c27c0 100644
--- a/lang/TenDRA/files/patch-install
+++ b/lang/TenDRA/files/patch-install
@@ -1,43 +1,49 @@
-Index: mk/base/tendra.install.mk
-===================================================================
-RCS file: /usr/home/stefan/tendra/cvsup/tendra/mk/base/tendra.install.mk,v
-retrieving revision 1.19
-diff -u -r1.19 tendra.install.mk
---- mk/base/tendra.install.mk	18 Aug 2003 04:35:26 -0000	1.19
-+++ mk/base/tendra.install.mk	19 Aug 2003 14:23:00 -0000
-@@ -21,7 +21,6 @@
+--- mk/base/tendra.install.mk.orig	Wed Aug 27 09:00:00 2003
++++ mk/base/tendra.install.mk	Thu Aug 28 21:14:55 2003
+@@ -24,10 +24,6 @@
  
  .if defined(API)
  INSTALL_TARGETS+=	install-api
 -INSTALL_SUB+=		lib/include/${API}.api lib/include/shared/${API}.api
+-.if defined(API_SUBDIR)
+-INSTALL_SUB+=		${API_SUBDIR:C/^/lib\/include\/${API}.api\//}
+-.endif
  .endif
  
  .if defined(INSTALL_ENV)
-@@ -70,14 +69,9 @@
+@@ -102,27 +98,9 @@
  
  # lib/apis: our api files.
  install-api:
--	for i in ${.OBJDIR}.api/*.h; do \
--		${BIN_INSTALL} $$i ${INSTALL_PREFIX}/lib/include/${API}.api; \
+-.for i in ${API}.api shared/${API}.api
+-	cd ${OBJ_PREFIX}/lib/apis/${i}; \
+-	for i in *.h; do \
+-		${BIN_CP} ${OBJ_PREFIX}/lib/apis/${i}/$$i \
+-			${INSTALL_PREFIX}/lib/include/${i}/$$i; \
+-		${BIN_CHMOD} ${ARGS_CHMOD_DATA} \
+-			${INSTALL_PREFIX}/lib/include/${i}/$$i; \
 -	done
--	for i in ${.OBJDIR:C/apis/apis\/shared/}.api/*.h; do \
--		${BIN_INSTALL} $$i ${INSTALL_PREFIX}/lib/include/shared/${API}.api; \
+-.endfor
+-.if defined (API_SUBDIR)
+-.for i in ${API_SUBDIR}
+-	cd ${.OBJDIR}.api/${i}; \
+-	for i in *.h; do \
+-		${BIN_CP} ${.OBJDIR}.api/${i}/$$i \
+-			${INSTALL_PREFIX}/lib/include/${API}.api/${i}/$$i; \
+-		${BIN_CHMOD} ${ARGS_CHMOD_DATA} \
+-			${INSTALL_PREFIX}/lib/include/${API}.api/${i}/$$i; \
 -	done
--	${BIN_INSTALL} ${.OBJDIR:C/apis/apis\/lib/}/${API}.tl \
--		${INSTALL_PREFIX}/lib
-+	env MAKEOBJDIR=${OBJ_DIR}.api INSTALL=${BIN_INSTALL} \
-+		MKDIR=${BIN_MKDIR} ARGS_MKDIR=${ARGS_MKDIR} \
+-.endfor
+-.endif
+-
++	env MAKEOBJDIR=${OBJ_DIR}.api MKDIR="${BIN_MKDIR} ${ARGS_MKDIR}" \
++		CP=${BIN_CP} CHMOD="${BIN_CHMOD} ${ARGS_CHMOD_DATA}" \
 +		INSTALL_PREFIX=${INSTALL_PREFIX} make install
  
- # lib/env: our environment files.
- install-env:
-Index: src/tools/tspec/makefile.c
-===================================================================
-RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/tools/tspec/makefile.c,v
-retrieving revision 1.3
-diff -u -r1.3 makefile.c
---- src/tools/tspec/makefile.c	12 Dec 2002 05:54:55 -0000	1.3
-+++ src/tools/tspec/makefile.c	10 Jun 2003 12:36:12 -0000
+ # lib/apis/lib lib/apis/lib/diag: our tl files.
+ install-tl:
+--- src/tools/tspec/makefile.c.orig	Mon Aug 25 09:01:13 2003
++++ src/tools/tspec/makefile.c	Thu Aug 28 21:18:27 2003
 @@ -71,10 +71,10 @@
   */
  
@@ -119,7 +125,7 @@ diff -u -r1.3 makefile.c
  			int m;
  			char *a = i->api;
  			if (strneq (a, "shared/", 7)) a += 7;
-@@ -192,7 +230,19 @@
+@@ -192,7 +230,17 @@
  	
      /* End of makefile */
      IGNORE fputs ("clean :\n\trm -f ${JFILES}\n\n", output);
@@ -128,14 +134,12 @@ diff -u -r1.3 makefile.c
 +
 +    IGNORE fprintf (output, "install : \n"
 +					".for i in ${DIRS}\n"
-+					"\t${MKDIR} ${ARGS_MKDIR} ${INSTALL_PREFIX}/lib/include/${i}\n"
++					"\t${MKDIR} ${INSTALL_PREFIX}/lib/include/${i}\n"
 +					".endfor\n"
 +					".for i in ${HEADERS}\n"
-+					"\t${INSTALL} ../${i} ${INSTALL_PREFIX}/lib/include/"
-+					"${i:H}\n"
-+					".endfor\n"
-+					"\t${INSTALL} ../lib/%s/%s.tl ${INSTALL_PREFIX}/lib\n",
-+					api, api);
++					"\t${CP} ../${i} ${INSTALL_PREFIX}/lib/include/${i:H}\n"
++					"\t${CP} ../${i} ${INSTALL_PREFIX}/lib/include/${i:H}\n"
++					".endfor\n");
 +
      IGNORE fclose (output);
      return;