--- Imakefile.orig 2005-08-25 16:04:37 +0400 +++ Imakefile 2005-08-25 16:07:37 +0400 @@ -5,6 +5,10 @@ XCOMM other people do also, so perhaps you could do us all a favor and XCOMM distribute this one. XCOMM +XCOMM /*G*/ I am NOT sure confilcting with twm is good idea. +XCOMM Pulling out TWMDIR dependencies +XCOMM And thewre IS CONFDIR in Imake.tmpl, you Imakefiles lover! +XCOMM Usinc CTWMCONFDIR instead #include "Imakefile.local" @@ -136,8 +140,8 @@ -aux-info $@.info #endif -PIXMAPDIR = $(TWMDIR)/images -CONFDIR = $(TWMDIR) +PIXMAPDIR = $(LIBDIR)/ctwm/images +CTWMCONFDIR= $(CONFDIR)/ctwm LOCAL_LIBRARIES = $(M4LIB) $(IMCONVLIB) $(XPMLIB) $(JPEGLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) $(SOUNDLIB) DEFINES = $(SIGNAL_DEFINES) $(M4DEFINES) $(GNOMEDEFINES) $(IMCONVDEFINES) $(XPMDEFINES) $(JPEGDEFINES) $(SESSIONDEFINES) $(SOUNDDEFINES) $(I18NDEFINES) $(DEBUGPARSERDEFINES) $(GNUREGEXDEFS) @@ -183,7 +187,7 @@ 3dcircle.xpm 3ddimple.xpm 3ddot.xpm 3dfeet.xpm 3dleopard.xpm \ 3dpie.xpm 3dpyramid.xpm 3dslant.xpm -SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="$(DESTDIR)$(CONFDIR)/system.ctwmrc"' '-DPIXMAP_DIRECTORY="$(DESTDIR)$(PIXMAPDIR)"') +SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="$(DESTDIR)$(CTWMCONFDIR)/system.ctwmrc"' '-DPIXMAP_DIRECTORY="$(DESTDIR)$(PIXMAPDIR)"') SpecialObjectRule(ctwm.o,ctwm.c,'-DPIXMAP_DIRECTORY="$(DESTDIR)$(PIXMAPDIR)"') #if !HasPutenv SpecialObjectRule(util.o,util.c,-DNOPUTENV) @@ -193,7 +197,7 @@ NormalLibraryTarget(ctwm, libctwm.o) ComplexProgramTarget(ctwm) -InstallNonExecFile(system.ctwmrc,$(CONFDIR)) +InstallNonExecFile(system.ctwmrc,$(CTWMCONFDIR)) #ifdef XPM install:: MakeDir($(DESTDIR)$(PIXMAPDIR))