Permalink
Browse files

OS-1630 screen needs to explicitly state its prefix

OS-1631 system screenrc should be in /etc not /usr
  • Loading branch information...
1 parent c477b05 commit 11554d9d1cf921d8ca1af0000a48b8e7102e42b8 @rmustacc rmustacc committed Oct 18, 2012
Showing with 40 additions and 0 deletions.
  1. +12 −0 screen/Makefile
  2. +28 −0 screen/Patches/screen.1.patch
View
@@ -27,6 +27,18 @@ include ../Makefile.defs
PATCHES = Patches/*
+#
+# It is important to make sure that screen has a prefix of /usr. When screen
+# builds and prefix is not set, it runs which screen to determine the prefix. On
+# the first build, this means that you will probably get /usr/bin/screen.
+# However, on subsequent builds, you will get the one from the proto area. Even
+# worse, if PATH were ever pathological, you could potentially get
+# /opt/local/bin which would be terrible.
+#
+AUTOCONF_OPTS = \
+ --prefix=/usr \
+ --with-sys-screenrc=/etc/screenrc
+
include ../Makefile.targ
all: all_autoconf
@@ -0,0 +1,28 @@
+diff --git a/doc/screen.1 b/doc/screen.1
+index 348d357..6886d2a 100644
+--- a/doc/screen.1
++++ b/doc/screen.1
+@@ -594,7 +594,7 @@ in the environment variable $SCREENDIR.
+ When
+ .I screen
+ is invoked, it executes initialization commands from the files
+-\*Q/usr/local/etc/screenrc\*U and
++\*Q/etc/screenrc\*U and
+ \*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's
+ defaults\*U that can be overridden in the following ways: for the
+ global screenrc file
+@@ -4416,12 +4416,12 @@ Examples in the
+ .I screen
+ distribution package for private and global initialization files.
+ .IP $SYSSCREENRC
+-.IP /usr/local/etc/screenrc
++.IP /etc/screenrc
+ .I screen
+ initialization commands
+ .IP $SCREENRC
+ .IP $HOME/.screenrc
+-Read in after /usr/local/etc/screenrc
++Read in after /etc/screenrc
+ .IP $SCREENDIR/S-<login>
+ .IP /local/screens/S-<login>
+ Socket directories (default)

0 comments on commit 11554d9

Please sign in to comment.