diff --git a/Makefile.am b/Makefile.am index 55572c7e70c8fd95a7ec2fb64f956911b8902575..fc5a60a7aadf5d7a146d4fa11815463e551c6242 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,8 +69,6 @@ EXTRA_DIST = \ doc/sections-file.txt \ doc/setting-up.txt \ doc/style-guide.txt \ - examples/README \ - examples/Makefile.am \ gtkdoc/meson.build \ gtkdoc_uninstalled.py.in \ style/COPYING \ diff --git a/buildsystems/autotools/Makefile.am b/buildsystems/autotools/Makefile.am index 705451e18edd7ceed9f531b55b61317b277b3174..f3172f6fb5aa999a05ecdbefd6b330854791c703 100644 --- a/buildsystems/autotools/Makefile.am +++ b/buildsystems/autotools/Makefile.am @@ -1,5 +1,6 @@ EXTRA_DIST = \ $(autotoolsdata_DATA) \ + $(autotools_examples_DATA) \ gtk-doc.m4 \ meson.build @@ -14,6 +15,12 @@ autotoolsdata_DATA = \ gtk-doc.no-xslt.make \ gtk-doc.no-xslt-flat.make +autotools_examplesdir = $(datadir)/gtk-doc/examples + +autotools_examples_DATA = \ + examples/README \ + examples/Makefile.am + aclocaldir = $(datadir)/aclocal aclocal_DATA = gtk-doc.m4 diff --git a/examples/Makefile.am b/buildsystems/autotools/examples/Makefile.am similarity index 100% rename from examples/Makefile.am rename to buildsystems/autotools/examples/Makefile.am diff --git a/examples/README b/buildsystems/autotools/examples/README similarity index 100% rename from examples/README rename to buildsystems/autotools/examples/README diff --git a/buildsystems/autotools/examples/meson.build b/buildsystems/autotools/examples/meson.build new file mode 100644 index 0000000000000000000000000000000000000000..0dfb59fba7a4a77b185aa6c177d5e45b26e820c7 --- /dev/null +++ b/buildsystems/autotools/examples/meson.build @@ -0,0 +1,10 @@ +install_data( + 'README', + 'Makefile.am', + install_dir: join_paths( + get_option('prefix'), + get_option('datadir'), + meson.project_name(), + 'examples' + ), +) diff --git a/buildsystems/autotools/meson.build b/buildsystems/autotools/meson.build index c9dc7643faef7a9e3884d3a3cd5f7402ed1cfa1b..72ec637200ddbca9487ba0eb5a11b519248c68eb 100644 --- a/buildsystems/autotools/meson.build +++ b/buildsystems/autotools/meson.build @@ -49,3 +49,5 @@ custom_target( '@OUTPUT@', ], ) + +subdir('examples') diff --git a/help/manual/C/index.docbook b/help/manual/C/index.docbook index 7baefb85fdd326b2f08901d0a42169bf20278b87..1e6a1ff3d398d97f2f342c2d03887ca16465f453 100644 --- a/help/manual/C/index.docbook +++ b/help/manual/C/index.docbook @@ -574,7 +574,7 @@ meep/ to your project's reference documentation directory (e.g. docs/reference/<package>). A local copy should be available under e.g. - /usr/share/doc/gtk-doc-tools/examples/Makefile.am. + /usr/share/gtk-doc/examples/Makefile.am. If you have multiple packages repeat this for each one.