use system tcl: clean up Imake files for dtdocbook/instant

diff --git a/cde/programs/dtdocbook/Imakefile b/cde/programs/dtdocbook/Imakefile
index cb689084344b511bd5880ebf7862ec84cc842a48..a2504152c315eff6cb8e6ab06860570cc73db1a6 100644 (file)
--- a/cde/programs/dtdocbook/Imakefile
+++ b/cde/programs/dtdocbook/Imakefile
@@ -3,7 +3,13 @@ XCOMM $XConsortium: Imakefile /main/6 1996/10/24 00:10:08 cde-hp $
 #define IHaveSubdirs
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
 
-SUBDIRS = doc2sdl lib tcl instant xlate_locale
+#if defined(LinuxArchitecture)
+TCLDIR =
+#else
+TCLDIR = tcl
+#endif
+
+SUBDIRS = doc2sdl lib $(TCLDIR) instant xlate_locale
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))

diff --git a/cde/programs/dtdocbook/instant/Imakefile b/cde/programs/dtdocbook/instant/Imakefile
index 8314e0dd2904d1d5cd9dc0b428f445ae16626a8d..01e4e8e81aafc0b8546f5d7d982bbde59a91cdd6 100644 (file)
--- a/cde/programs/dtdocbook/instant/Imakefile
+++ b/cde/programs/dtdocbook/instant/Imakefile
@@ -2,10 +2,19 @@ XCOMM $XConsortium: Imakefile /main/6 1996/11/29 11:06:09 rswiston $
 
 XLATESRC  = $(DTSVCSRC)/DtUtil2
 
-INCLUDES = -I../lib/tptregexp -I$(XLATESRC) -I/usr/include/tcl
+#if defined(LinuxArchitecture)
+TCLINC = -I/usr/include/tcl
+TCLLIB = -ltcl
+#else
+TCLINC = -I../tcl
+TCLLIB = ../tcl/libtcl.a
+#endif
+
+INCLUDES = -I../lib/tptregexp -I$(XLATESRC) $(TCLINC)
 DEPLIBS = $(DEPDTSVCLIB)
 LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) \
--L../lib/tptregexp -ltptregexp -ltcl
+       -L../lib/tptregexp -ltptregexp $(TCLLIB)
+
 #if defined(SunArchitecture)
 EXTRA_LIBRARIES = -lsocket -lnsl -lgen -lm
 #else