$NetBSD: patch-ab,v 1.4 2004/05/13 22:06:04 minskim Exp $

--- ../tcl/unix/Makefile.in.orig	2000-08-09 21:21:48.000000000 -0500
+++ ../tcl/unix/Makefile.in
@@ -147,30 +147,23 @@ static:	tcl.static tclXtest.static
 standalone: tcl.standalone tclXtest.standalone hello
 
 tcl: tclXAppInit.o @TCLX_SHLIB_BUILD_REF@ @TCLX_STLIB_BUILD_REF@ Makefile
-	${CC} ${LD_SWITCHES} tclXAppInit.o ${ALL_LIBS} \
-	    -o $@ || (rm -f $@; exit 1)
+	${LD} tclXAppInit.o -o $@ ${TCLX_SHLIB_NAME:C/\.so.*/.la/} -L${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl -lm ${TCL_LIBS}
 
 tcl.static: tclXAppInit.o @TCLX_STLIB_BUILD_REF@ Makefile
-	${CC} ${LD_SWITCHES} tclXAppInit.o ${STATIC_LIBS} \
-	    -o $@ || (rm -f $@; exit 1)
+	${LD} ${LD_SWITCHES} tclXAppInit.o ${STATIC_LIBS} -o $@
 
 tcl.standalone: tclXAppInitSA.o @TCLX_STLIB_BUILD_REF@ Makefile
-	${CC} ${LD_SWITCHES} tclXAppInitSA.o ${STATIC_LIBS} \
-	    -o $@ || (rm -f $@; exit 1)
+	${LD} ${LD_SWITCHES} tclXAppInitSA.o ${STATIC_LIBS} -o $@
 
 ${TCLX_STLIB_NAME}: ${OBJS}
-	${AR} cr ${TCLX_STLIB_NAME} ${OBJS}
-	${RANLIB} ${TCLX_STLIB_NAME}
+#	${AR} cr ${TCLX_STLIB_NAME} ${OBJS}
+#	${RANLIB} ${TCLX_STLIB_NAME}
 
 @TCLX_SHLIB_BUILD_TARGET@: ${SOBJS}
-	rm -f ${TCLX_SHLIB_NAME}
-	PATH=${TCL_UNIX_DIR}:${PATH}; export PATH; \
-	TCL_LIBRARY=${TCL_UNIX_DIR}/../library; export TCL_LIBRARY; \
-	LD_LIBRARY_PATH=${TCL_UNIX_DIR}:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \
-	${TCL_SHLIB_LD} -o ${TCLX_SHLIB_NAME} ${SOBJS} ${TCL_SHLIB_LD_LIBS}
+	${LIBTOOL} @CC@ --mode=link -o ${TCLX_SHLIB_NAME:C/\.so.*/.la/} ${SOBJS:.o=.lo} -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl -lm -version-info 1:0
 
 hello:	hello.c
-	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
+	${LD} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
 
 #------------------------------------------------------------------------------
 # Do some special checks to make sure TclX is built ok.
@@ -224,16 +217,13 @@ help.tmp:
 # Generate the test programs.
 #
 tclXtest: ${TEST_OBJS} ${TCLX_LIB_NAME}
-	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${ALL_LIBS} \
-	    -o $@ || (rm -f $@; exit 1)
+	${LD} ${TEST_OBJS} -o $@ ${TCLX_SHLIB_NAME:C/\.so.*/.la/} -L${PREFIX}/lib -rpath ${PREFIX}/lib -ltcl -lm ${TCL_LIBS}
 
 tclXtest.static: ${TEST_OBJS} ${TCLX_STLIB_NAME}
-	${CC} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} \
-	    -o $@ || (rm -f $@; exit 1)
+	${LD} ${LD_SWITCHES} ${TEST_OBJS} ${STATIC_LIBS} -o $@
 
 tclXtest.standalone: ${TEST_SAOBJS} ${TCLX_STLIB_NAME}
-	${CC} ${LD_SWITCHES} ${TEST_SAOBJS} ${STATIC_LIBS} \
-	    -o $@ || (rm -f $@; exit 1)
+	${LD} ${LD_SWITCHES} ${TEST_SAOBJS} ${STATIC_LIBS} -o $@
 
 tclXtest.o: ${TCLX_GENERIC_DIR}/tclXtest.c
 	${CC} -c ${CC_SWITCHES} ${TCLX_GENERIC_DIR}/tclXtest.c
@@ -318,7 +308,6 @@ buildhelp: tcl tcl.tndx
 	${BLDMANHELP} ${TCL_SRC_DIR}/doc ${TCLX_TOOLS_SRC_DIR}/tclmanpages \
 	    ${HELP_DIR} Tcl.brf
 	${RUNTCL} -c "buildhelp ${HELP_DIR} TclX.brf ${TCLX_DOC_DIR}/TclX.n"
-	${INSTCOPY} ${HELP_DIR} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
 
 #------------------------------------------------------------------------------
 
@@ -330,28 +319,24 @@ install-libraries: install-runtime insta
 
 install-doc: 
 
-install-misc: ${BUILDHELP}
-	${INSTCOPY} ${TCLX_GENERIC_DIR}/tclExtend.h \
-	    ${INSTALL_ROOT}${TCLX_INST_INCL}
-	${INSTCOPY} ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c \
-	    ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
+install-misc:
+	-${BSD_INSTALL_DATA_DIR}  ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
+	${BSD_INSTALL_DATA} ${TCLX_GENERIC_DIR}/tclExtend.h ${INSTALL_ROOT}${TCLX_INST_INCL}
+	${BSD_INSTALL_DATA} ${TCLX_UNIX_SRC_DIR}/tclXAppInit.c ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
+	${BSD_INSTALL_DATA_DIR} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
+	cd ${HELP_DIR} && ${GTAR} cf - . | (cd ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help && ${GTAR} xf -)
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTALL_ROOT}${TCLX_INST_RUNTIME}/help
 
 install-runtime:
-	${INSTCOPY} tclx.tcl tcl.tlib tcl.tndx buildidx.tcl autoload.tcl \
-	    ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
+	-${BSD_INSTALL_DATA_DIR}  ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
+	${BSD_INSTALL_DATA} tclx.tcl tcl.tlib tcl.tndx buildidx.tcl autoload.tcl ${INSTALL_ROOT}${TCLX_INST_RUNTIME}
 
 install-exec:
-	${INSTCOPY} tcl ${INSTALL_ROOT}${TCLX_INST_BIN}
-	${STRIP} ${INSTALL_ROOT}${TCLX_INST_BIN}/tcl
-	if test "X@TCLX_STLIB_BUILD_REF@" != "X"; then \
-	    ${INSTCOPY} ${TCLX_STLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB}; \
-	    ${RANLIB} ${INSTALL_ROOT}${TCLX_INST_LIB}/${TCLX_STLIB_NAME}; \
-	fi
-	${INSTCOPY} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB}
-	if test "@SHARED_BUILD@" = "1"; then \
-	    ${INSTCOPY} ${TCLX_SHLIB_NAME} ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
-	    ${INSTCOPY} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\
-	fi
+	-${BSD_INSTALL_DATA_DIR}  ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME}
+	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} tcl ${INSTALL_ROOT}${TCLX_INST_BIN}
+	${BSD_INSTALL_SCRIPT} tclxConfig.sh ${INSTALL_ROOT}${TCLX_INST_LIB}
+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${TCLX_SHLIB_NAME:C/\.so.*/.la/} ${INSTALL_ROOT}${TCLX_INST_LIB} ;\
+	${BSD_INSTALL_DATA} pkgIndex.tcl ${INSTALL_ROOT}${TCLX_EXEC_RUNTIME} ;\
 
 #------------------------------------------------------------------------------
 config: