[PATCH] gprofng: install examples to $(docdir)/gprofng

[Vladimir Mezentsev]

On 10/10/24 14:51, H.J. Lu wrote:
> On Thu, Oct 10, 2024 at 3:35 AM <vladimir.mezentsev@oracle.com> wrote:
>> From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
>>
>> gprofng/ChangeLog
>> 2024-10-09  Vladimir Mezentsev  <vladimir.mezentsev@oracle.com>
>>
>>          * doc/Makefile.am: Install gprofng examples.
>>          * doc/Makefile.in: Rebuild.
>> ---
>>   gprofng/doc/Makefile.am | 10 ++++++++++
>>   gprofng/doc/Makefile.in | 12 +++++++++---
>>   2 files changed, 19 insertions(+), 3 deletions(-)
>>
>> diff --git a/gprofng/doc/Makefile.am b/gprofng/doc/Makefile.am
>> index 7c88e144ab6..fcd079671ba 100644
>> --- a/gprofng/doc/Makefile.am
>> +++ b/gprofng/doc/Makefile.am
>> @@ -59,3 +59,13 @@ MAINTAINERCLEANFILES = gprofng.info $(man_MANS)
>>   EXTRA_DIST = $(man_MANS) version.texi
>>
>>   info: $(man_MANS)
>> +
>> +examples.tar.gz:
>> +       $(AM_V_at)( tar czf $@ $(srcdir)/../examples )
>> +
>> +install-examples:  examples.tar.gz
>> +       $(mkinstalldirs) $(docdir)/gprofng
>> +       $(INSTALL_DATA) examples.tar.gz $(docdir)/gprofng
> This breaks "make install DESTDIR=xxx".

yes. I never used "DESTDIR=". gprofng will not work after such 
installation. gprofng reads $(sysconfdir)/gprofng.rc for configuration. 
The location of this file is set at compile time. We set LD_PRELOAD 
using "$(libdir)/gprofng". It is also set at compile time.
>   I am testing this change:

Please apply your fix.

-Vladimir

>
> diff --git a/gprofng/doc/Makefile.am b/gprofng/doc/Makefile.am
> index fcd079671ba..83e6006899b 100644
> --- a/gprofng/doc/Makefile.am
> +++ b/gprofng/doc/Makefile.am
> @@ -64,8 +64,7 @@ examples.tar.gz:
>    $(AM_V_at)( tar czf $@ $(srcdir)/../examples )
>
>   install-examples:  examples.tar.gz
> - $(mkinstalldirs) $(docdir)/gprofng
> - $(INSTALL_DATA) examples.tar.gz $(docdir)/gprofng
> + $(mkinstalldirs) $(DESTDIR)$(docdir)/gprofng
> + $(INSTALL_DATA) examples.tar.gz $(DESTDIR)$(docdir)/gprofng
>
>   install-am: install-examples
> -
> diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in
> index 3e625433f95..98aa1056357 100644
> --- a/gprofng/doc/Makefile.in
> +++ b/gprofng/doc/Makefile.in
> @@ -894,8 +894,8 @@ examples.tar.gz:
>    $(AM_V_at)( tar czf $@ $(srcdir)/../examples )
>
>   install-examples:  examples.tar.gz
> - $(mkinstalldirs) $(docdir)/gprofng
> - $(INSTALL_DATA) examples.tar.gz $(docdir)/gprofng
> + $(mkinstalldirs) $(DESTDIR)$(docdir)/gprofng
> + $(INSTALL_DATA) examples.tar.gz $(DESTDIR)$(docdir)/gprofng
>
>   install-am: install-examples
>
>> +
>> +install-am: install-examples
>> +
>> diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in
>> index 9b9f81cb780..3e625433f95 100644
>> --- a/gprofng/doc/Makefile.in
>> +++ b/gprofng/doc/Makefile.in
>> @@ -667,9 +667,6 @@ install-exec: install-exec-am
>>   install-data: install-data-am
>>   uninstall: uninstall-am
>>
>> -install-am: all-am
>> -       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
>> -
>>   installcheck: installcheck-am
>>   install-strip:
>>          if test -z '$(STRIP)'; then \
>> @@ -893,6 +890,15 @@ gprofng-display-text.1: $(srcdir)/gprofng-display-text.texi
>>
>>   info: $(man_MANS)
>>
>> +examples.tar.gz:
>> +       $(AM_V_at)( tar czf $@ $(srcdir)/../examples )
>> +
>> +install-examples:  examples.tar.gz
>> +       $(mkinstalldirs) $(docdir)/gprofng
>> +       $(INSTALL_DATA) examples.tar.gz $(docdir)/gprofng
>> +
>> +install-am: install-examples
>> +
>>   # Tell versions [3.59,3.63) of GNU make to not export all variables.
>>   # Otherwise a system limit (for SysV at least) may be exceeded.
>>   .NOEXPORT:
>> --
>> 2.43.5
>>
>