diff options
| author | Mattia Rizzolo <mattia@mapreri.org> | 2021-07-29 12:14:03 +0200 |
|---|---|---|
| committer | Nick Wellnhofer <wellnhofer@aevum.de> | 2022-01-16 14:59:02 +0100 |
| commit | 967534504827fa79d39903ab0f94a7583a3925b9 (patch) | |
| tree | 0ce26adbcada925c8e82c3458c1e611b7cea2a4a | |
| parent | 7c0253aadfe0ce69b077b66bf74fa26ff17728d1 (diff) | |
| download | libxml2-967534504827fa79d39903ab0f94a7583a3925b9.tar.gz | |
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 <mattia@mapreri.org>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | doc/examples/Makefile.am | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 716a17fc..eb906b07 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1283,8 +1283,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 ef59fcef..446ecb85 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 |