X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Imakefile;fp=Imakefile;h=3ab9201ceea2313fcff07897eb2ed7f4fef42b9d;hb=6f2dd6948ba92a5695b8f70089223492611194d8;hp=72db51e03e255d855aa819ffea9d8cbc61925853;hpb=f72ceed5dbbe14bb38e6b07adf7759e2f4c7dbe8;p=vtwm.git

diff --git a/Imakefile b/Imakefile
index 72db51e..3ab9201 100644
--- a/Imakefile
+++ b/Imakefile
@@ -56,8 +56,21 @@ XCOMM   NEED_PROCESS_H = -DNEED_PROCESS_H
 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)
@@ -113,8 +126,8 @@ SpecialObjectRule(util.o,gram.h,$(NEED_PUTENV_F))
 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)
@@ -123,7 +136,7 @@ NormalProgramTarget(vtwm,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),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
 
@@ -161,8 +174,13 @@ lastmake.c:
 	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: