diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-29 09:50:45 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-29 09:50:45 +0100 |
commit | 5bc99a0f87385a5628a67b6b4e518cdcc45f68bd (patch) | |
tree | 4aaee61387179593265bb45f3831350af1b32c9e /debian/rules | |
parent | dcc4bb10e01d6b39ef614bd516fb362f1abc24c8 (diff) |
Hardcode the location of xauth to /usr/bin/xauth rather than
/usr/bin/X11/xauth (thanks, Aron Griffis; closes: #575725, LP: #8440).
xauth no longer depends on x11-common, so we're no longer guaranteed to
have the /usr/bin/X11 symlink available. I was taking advantage of the
/usr/bin/X11 symlink to smooth X's move to /usr/bin, but this is far
enough in the past now that it's probably safe to just use /usr/bin.
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules index 2101c97ee..ba78595af 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -97,7 +97,7 @@ confflags += --with-selinux | |||
97 | endif | 97 | endif |
98 | 98 | ||
99 | # The deb build wants xauth; the udeb build doesn't. | 99 | # The deb build wants xauth; the udeb build doesn't. |
100 | confflags += --with-xauth=/usr/bin/X11/xauth | 100 | confflags += --with-xauth=/usr/bin/xauth |
101 | confflags_udeb += --without-xauth | 101 | confflags_udeb += --without-xauth |
102 | 102 | ||
103 | # Default paths. The udeb build has /usr/bin/X11 and /usr/games removed. | 103 | # Default paths. The udeb build has /usr/bin/X11 and /usr/games removed. |