[PATCH:twm] Read system.twmrc from where it got installed

Bryan Kadzban github at kadzban.net
Sun Sep 11 22:20:13 UTC 2016


${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.  :-) )
---
  src/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

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)
-- 
2.10.0



More information about the xorg-devel mailing list