diff options
| author | Sven Joachim <svenjoac@gmx.de> | 2019-10-02 18:26:07 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2019-10-04 10:29:23 +0200 |
| commit | de0d39f825cce7422986011ee9d5db91f15e2987 (patch) | |
| tree | 39caff76edb05b7647c98ee447930e4eb1c40f70 | |
| parent | 726e4230c6ffe3148f9877eba32287cfe8d158c1 (diff) | |
modesetting: Fix broken manpage in autoconf build
The autoconf build for the modesetting driver still relied on
xorg-macros.m4 for string replacements and did not include the
top-level manpages.am. As a result, no substitutions took place after
commit 2e497bf887aca832dc0dd30d071c5288ab5c1e15.
This should be a candidate for the 1.20 branch.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
| -rw-r--r-- | hw/xfree86/drivers/modesetting/Makefile.am | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/hw/xfree86/drivers/modesetting/Makefile.am b/hw/xfree86/drivers/modesetting/Makefile.am index e0411ef51..961c57408 100644 --- a/hw/xfree86/drivers/modesetting/Makefile.am +++ b/hw/xfree86/drivers/modesetting/Makefile.am @@ -24,6 +24,8 @@ # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. +include $(top_srcdir)/manpages.am + AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(LIBDRM_CFLAGS) $(UDEV_CFLAGS) $(CWARNFLAGS) AM_CPPFLAGS = \ @@ -62,9 +64,3 @@ driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) EXTRA_DIST = modesetting.man CLEANFILES = $(driverman_DATA) - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - -.man.$(DRIVER_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ |