b10971c
diff -up xterm-255/minstall.sh.man-page_paths xterm-255/minstall.sh
b10971c
--- xterm-255/minstall.sh.man-page_paths	2010-01-20 11:55:42.000000000 +0100
b10971c
+++ xterm-255/minstall.sh	2010-02-02 17:52:11.000000000 +0100
b10971c
@@ -74,9 +74,9 @@ MY_MANSECT=$suffix
b10971c
 # are only a few common choices.  Note that they may not necessarily appear
b10971c
 # in the same directories.  Prefer utmpx/wtmpx to utmp/wtmp, since that's
b10971c
 # the way the configure script is designed.
b10971c
-UTMP_NAME=utmp22
b10971c
+UTMP_NAME=utmp
b10971c
 UTMP_PATH=/etc
b10971c
-for name in /etc /var/adm /var/log
b10971c
+for name in /etc /var/adm /var/log /var/run
b10971c
 do
b10971c
 	if test -f $name/utmpx ; then
b10971c
 		UTMP_NAME=utmpx
b10971c
@@ -109,6 +109,10 @@ WTMP_PATH=$WTMP_PATH/$WTMP_NAME
b10971c
 X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*\([^) ][^) ]*\).*/\1/'`
b10971c
 test -z "$X_MANSECT" && X_MANSECT=$suffix
b10971c
 
b10971c
+fontpath=/usr/share/X11/fonts
b10971c
+xorgcfgdir=/etc/X11
b10971c
+xorgcfgfil=xorg.conf
b10971c
+X_MANSECT=7
b10971c
 sed	-e 's%__vendorversion__%"X Window System"%' \
b10971c
 	-e s%__apploaddir__%$APPS_DIR% \
b10971c
 	-e s%__mansuffix__%$MY_MANSECT%g \
b10971c
@@ -117,6 +121,9 @@ sed	-e 's%__vendorversion__%"X Window Sy
b10971c
 	-e s%/etc/utmp%$UTMP_PATH%g \
b10971c
 	-e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \
b10971c
 	-e s%/etc/wtmp%$WTMP_PATH%g \
b10971c
+ 	-e s%__fontpath__%$fontpath%g \
b10971c
+ 	-e s%__xorgcfgdir__%$xorgcfgdir%g \
b10971c
+ 	-e s%__xorgcfgfil__%$xorgcfgfil%g \
b10971c
 	$OLD_FILE >$NEW_FILE
b10971c
 
b10971c
 echo "$MINSTALL $OLD_FILE $END_FILE"
b10971c
diff -up xterm-255/xterm.man.man-page_paths xterm-255/xterm.man
b10971c
--- xterm-255/xterm.man.man-page_paths	2010-01-20 11:55:58.000000000 +0100
b10971c
+++ xterm-255/xterm.man	2010-02-02 17:50:29.000000000 +0100
b10971c
@@ -1701,17 +1701,17 @@ Since X11R6, bitmap fonts have been scal
69b28ac
 The font server claims to provide the bold font that \fIxterm\fP requests,
69b28ac
 but the result is not always readable.
69b28ac
 XFree86 provides a feature which can be used to suppress the scaling.
69b28ac
-In the X server's configuration file (e.g., "/etc/X11/XFree86"), you
69b28ac
+In the X server's configuration file (e.g., __xorgcfgdir__/__xorgcfgfil__), you
69b28ac
 can add ":unscaled" to the end of the directory specification for the
69b28ac
 "misc" fonts, which comprise the fixed-pitch fonts that are used by \fIxterm\fP.
69b28ac
 For example
69b28ac
 .RS
69b28ac
-	FontPath	"/usr/lib/X11/fonts/misc/"
69b28ac
+	FontPath	"__fontpath__"
69b28ac
 .RE
69b28ac
 .IP
69b28ac
 would become
69b28ac
 .RS
69b28ac
-	FontPath	"/usr/lib/X11/fonts/misc/:unscaled"
69b28ac
+	FontPath	"__fontpath__/misc/:unscaled"
69b28ac
 .RE
69b28ac
 .IP
69b28ac
 Depending on your configuration, the font server may have its own configuration