summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Kadzban <github@kadzban.net>2016-09-11 15:20:13 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2019-03-03 14:23:28 -0800
commitee3dcf350b5621d7965a8b8185a3dc534bcc46c7 (patch)
tree2fcc744721795ce666b8e2c72374a5ff00fe209e
parent3045f271739da5068b1744f0dc4848d8a5ef7d06 (diff)
Read system.twmrc from where it got installed
${rcdir} is ${datadir}/X11/twm by default, but can be overridden when running make. If it is overridden, then the code should read from the same place as where "make rcdir=FOO install" puts the file. (Obviously overriding rcdir= for "make install" requires overriding it for "make" as well. But at least this way it's possible to get it to work. :-) ) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 092d8ce..ba9c7b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ dist_rc_DATA = system.twmrc
AM_CPPFLAGS = \
-DXVENDORNAME=\"The\ X.Org\ Foundation\" \
-DXORG_RELEASE=\"Release\ $(VERSION)\" \
- -DSYSTEM_INIT_FILE=\"${datadir}/X11/twm/system.twmrc\"
+ -DSYSTEM_INIT_FILE=\"${rcdir}/system.twmrc\"
AM_CFLAGS = $(TWM_CFLAGS)
twm_LDADD = $(TWM_LIBS)