[PATCH libXi 3/3] man: remove redundant nodist prefix to libman_DATA

[Dan Nicholson]

On Sat, Jan 23, 2010 at 4:36 PM, Gaetan Nadon <memsize at videotron.ca> wrote:
> On Sat, 2010-01-23 at 15:37 -0800, Dan Nicholson wrote:
>
> On Sat, Jan 23, 2010 at 12:26 PM, Gaetan Nadon <memsize at videotron.ca> wrote:
>> The final, macro substituded, man pages (with file extension .3
>> on my platform), are installed, but not distributed. There is no
>> need to override the correct default behaviour.
>>
>> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
>> ---
>>  man/Makefile.am |    4 ++--
>>  1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/man/Makefile.am b/man/Makefile.am
>> index baa0492..224143e 100644
>> --- a/man/Makefile.am
>> +++ b/man/Makefile.am
>> @@ -112,11 +112,11 @@ libman_ref = \
>>  libman_pre = $(libman_txt:.txt=.man) $(libman_ref)
>>
>>  if INSTALL_MANPAGES
>> -nodist_libman_DATA = $(libman_pre:.man=.$(LIB_MAN_SUFFIX))
>> +libman_DATA = $(libman_pre:.man=.$(LIB_MAN_SUFFIX))
>>  endif
>>
>>  EXTRA_DIST = $(libman_txt) $(libman_pre)
>> -CLEANFILES = $(nodist_libman_DATA) *.libmansuffix
>> +CLEANFILES = $(libman_DATA) *.libmansuffix
>>  MAINTAINERCLEANFILES = $(libman_pre) *.xml
>
> We don't actually want libman_DATA to be in CLEANFILES. If you have a
> tarball with the generated pages, running "make clean" will destroy
> them, and the only way to get them back will be to unpack the tarball
> again. They should probably be in MAINTAINERCLEANFILES.
>
> What you are saying is true, but it applies to libman.pre which is the .man
> files. These are the ones we don't want to clean on a 'make clean' run. The
> libman_DATA variable contains the list of .3 files. These we want to clean
> (and not put in the tarball). It's confusing because different makefiles use
> variable names differently. In the server, the same file extensions
> represent different file types.
>
> The output of 'make -n clean' contains only *.3 files. No .man on the list.
> When testing the tarball scenario, I do a clean before making a tarball
> without-xmlto so the dist would fail if the .man files were missing. When
> testing the git scenario, I do a maintainer-clean without-xmlto and dist
> does fail as expected (no man files, no xmlto, no candy).
>
> $ make -n clean
> test -z "XAllowDeviceEvents.3 XChangeDeviceDontPropagateList.3

Oh, right, that makes sense.

Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>