diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-06-28 17:10:21 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-07-05 16:39:32 -0400 |
| commit | 414a6aac17d3afeed2db30f7990edbb81b244676 (patch) | |
| tree | 7b981e40f30e1f09cc0ddf897afb58ff7b441656 | |
| parent | a0b7f755e925194b8245d580182fede9ee197985 (diff) | |
Revert "build: apply the distcheck tricks used in xf86-input-evdev"
This reverts commit 6eb829e07e455a8a04dabae7f257dd42a9b8bcdf.
Althought this feature is desirable, it introduces a dormant bug.
The value of sdkdir during distcheck points to an empty xserver sdkdir
where xserver-properties.h is expected by the tools.
Specifying XORG_CFLAGS for the tools worked around the issue by supplying
the real path to the xserver sdk. tools must not depend on xserver.
In any case it would be a brittle workaround.
--with-xorg-conf-dir='$${sysconfdir}/xorg':
althought this value will work, it brings some confusion as it is
unrelated to the where the configuration files are normally placed,
relative to $prefix which is /usr/share/X11 and not /etc.
This feature can be reintroduced later with the proper solution.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index e94fe19..07cb902 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,12 +18,6 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# During distcheck, system locations (as provided by pkg-config) are -# not writable; provide instead relative locations. -DISTCHECK_CONFIGURE_FLAGS = \ - --with-sdkdir='$${includedir}/xorg' \ - --with-xorg-conf-dir='$${sysconfdir}/xorg' - MAINTAINERCLEANFILES = ChangeLog INSTALL pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index bf99958..dfef591 100644 --- a/configure.ac +++ b/configure.ac @@ -146,11 +146,6 @@ if test "x$have_libxtst" = "xyes" ; then fi # ----------------------------------------------------------------------------- -# Workaround overriding sdkdir to be able to create a tarball when user has no -# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am -AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) -AC_SUBST([sdkdir]) - AC_CONFIG_FILES([Makefile xorg-synaptics.pc]) AC_OUTPUT |