XCOMM Installation path for the binary
VTWMBINDIR = $(BINDIR)
-XCOMM Installation path for the system resource file
- VTWMLIBDIR = $(LIBDIR)/twm
+/*
+ * If EtcX11Directory is defined, we're using a relatively modern X.Org or
+ * XFree86 release.
+ */
+#ifdef EtcX11Directory
+ CONFDIR = $(ETCX11DIR)
+#else
+ CONFDIR = $(LIBDIR)
+#endif
+
+XCOMM Installation path for VTWM's system resource file
+ VTWMCONFDIR = $(CONFDIR)/vtwm
+
+XCOMM Location where we search for TWM's system resource file
+ TWMCONFDIR = $(CONFDIR)/twm
XCOMM Installation path for the man page
VTWMMANDIR = $(MANDIR)
SpecialObjectRule(events.o,gram.h,$(NEED_SELECT_H))
SpecialObjectRule(parse.o,gram.h,$(NEED_YYLINENO_V) \
-'-DSYSTEM_VTWMRC="'$(VTWMLIBDIR)'/system.vtwmrc"' \
-'-DSYSTEM_TWMRC="'$(VTWMLIBDIR)'/system.twmrc"')
+'-DSYSTEM_VTWMRC="'$(VTWMCONFDIR)'/system.vtwmrc"' \
+'-DSYSTEM_TWMRC="'$(VTWMCONFDIR)'/system.twmrc"')
SpecialObjectRule(add_window.o applets.o icons.o \
list.o regions.o sound.o twm.o,gram.h,NullParameter)
InstallProgram(vtwm,$(VTWMBINDIR))
InstallManPage(vtwm,$(VTWMMANDIR))
-InstallNonExecFile(system.vtwmrc,$(VTWMLIBDIR))
+InstallNonExecFile(system.vtwmrc,$(VTWMCONFDIR))
depend:: lex.c gram.c deftwmrc.c lastmake.c vtwm.man
echo ' */' >>$@
echo '' >>$@
echo 'char *lastmake[] = {' >>lastmake.c
+ifdef SOURCE_DATE_EPOCH
+ echo ' "Platform: -",' >>$@
+ echo ' "Build: '`LC_ALL=C date --utc --date=@$${SOURCE_DATE_EPOCH}`'",' >>$@
+else
echo ' "Platform: '`uname -r -s`'",' >>$@
echo ' "Build: '`date`'",' >>$@
+endif
echo ' "" };' >>$@
system.vtwmrc: