[libxml2] Correctly install the HTML examples into their subdirectory.



commit 967534504827fa79d39903ab0f94a7583a3925b9
Author: Mattia Rizzolo <mattia mapreri org>
Date:   Thu Jul 29 12:14:03 2021 +0200

    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>

 Makefile.am              | 2 ++
 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]