From 6f844b9f9e41c08371372adb5314f3f17a19181c Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Thu, 29 Jul 2021 12:14:03 +0200 Subject: [PATCH] Correctly install the HTML examples into their subdirectory. Previous to this commit, the examples where installed haphazardly within all the other html documents, also overwriting index.html, for example. Signed-off-by: Mattia Rizzolo --- Makefile.am | 2 ++ doc/examples/Makefile.am | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index a9284b95b..b57eb0e88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1285,8 +1285,10 @@ install-data-local: -$(INSTALL) -m 0644 $(srcdir)/testSAX.c $(DESTDIR)$(EXAMPLES_DIR) -$(INSTALL) -m 0644 $(srcdir)/testHTML.c $(DESTDIR)$(EXAMPLES_DIR) -$(INSTALL) -m 0644 $(srcdir)/testXPath.c $(DESTDIR)$(EXAMPLES_DIR) + @echo "If the documentation is installed, please also look at html/examples for more." > $(DESTDIR)$(EXAMPLES_DIR)/README uninstall-local: + rm -f $(DESTDIR)$(EXAMPLES_DIR)/README rm -f $(DESTDIR)$(EXAMPLES_DIR)/testXPath.c rm -f $(DESTDIR)$(EXAMPLES_DIR)/testHTML.c rm -f $(DESTDIR)$(EXAMPLES_DIR)/testSAX.c diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index ef59fcef7..446ecb85d 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -23,8 +23,8 @@ index.html: examples.xml examples.xsl endif install-data-local: - $(MKDIR_P) $(DESTDIR)$(HTML_DIR) - -$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR) + $(MKDIR_P) $(DESTDIR)$(HTML_DIR)/examples + -$(INSTALL) -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)/examples/ clean-local: test -f Makefile.am || rm -f test?.xml -- GitLab