Browse Source

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

Jon Trulson 5 years ago
parent
commit
e82991579f
2 changed files with 18 additions and 3 deletions
  1. 7 1
      cde/programs/dtdocbook/Imakefile
  2. 11 2
      cde/programs/dtdocbook/instant/Imakefile

+ 7 - 1
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))

+ 11 - 2
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