ALT Linux repos
Group :: Graphical desktop/Other
RPM: ctwm
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: ctwm-3.8-dirs.patch
Download
Download
diff -ur ctwm-3.8.2.old/Imakefile ctwm-3.8.2/Imakefile
--- ctwm-3.8.2.old/Imakefile 2014-07-14 06:13:45.000000000 +0000
+++ ctwm-3.8.2/Imakefile 2014-07-14 06:39:26.427825025 +0000
@@ -5,6 +5,11 @@
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 a good idea,
+XCOMM so I pulled out TWMDIR dependencies.
+XCOMM And there is CONFDIR in Imake.tmpl, you Imakefiles lovers!
+XCOMM Using CTWMCONFDIR instead.
+XCOMM
#include "Imakefile.local"
@@ -118,8 +123,8 @@
-Winline -Wnested-externs -Wmissing-declarations
#endif
-PIXMAPDIR = $(TWMDIR)/images
-CONFDIR = $(TWMDIR)
+PIXMAPDIR = $(LIBDIR)/ctwm/images
+CTWMCONFDIR= $(CONFDIR)/ctwm
LOCAL_LIBRARIES = $(IMCONVLIB) $(XPMLIB) $(JPEGLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) $(SOUNDLIB)
DEFINES = $(SIGNAL_DEFINES) $(M4DEFINES) $(GNOMEDEFINES) $(IMCONVDEFINES) $(XPMDEFINES) $(JPEGDEFINES) $(SOUNDDEFINES) $(DEBUGPARSERDEFINES) $(GNUREGEXDEFS)
@@ -165,7 +170,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="$(CONFDIR)/system.ctwmrc"' '-DPIXMAP_DIRECTORY="$(PIXMAPDIR)"' '-DM4CMD="$(M4CMD)"')
+SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="$(CTWMCONFDIR)/system.ctwmrc"' '-DPIXMAP_DIRECTORY="$(PIXMAPDIR)"' '-DM4CMD="$(M4CMD)"')
SpecialObjectRule(ctwm.o,ctwm.c,'-DPIXMAP_DIRECTORY="$(PIXMAPDIR)"')
#if !HasPutenv
SpecialObjectRule(util.o,util.c,-DNOPUTENV)
@@ -175,7 +180,7 @@
NormalLibraryTarget(ctwm, libctwm.o)
ComplexProgramTarget(ctwm)
-InstallNonExecFile(system.ctwmrc,$(CONFDIR))
+InstallNonExecFile(system.ctwmrc,$(CTWMCONFDIR))
#ifdef XPM
install::
MakeDir($(DESTDIR)$(PIXMAPDIR))