[PATCH libX11] specs: install html images in $docdir with html files

Gaetan Nadon memsize at videotron.ca
Fri Feb 5 09:43:26 PST 2010


The images required by the html files have been omitted.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 specs/XIM/Makefile.am    |    2 --
 specs/i18n/Makefile.am   |    4 +---
 specs/libX11/Makefile.am |    3 ---
 specs/troffrules.in      |   27 +++++++++++++++++++++++++--
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/specs/XIM/Makefile.am b/specs/XIM/Makefile.am
index 89806bd..c0368b9 100644
--- a/specs/XIM/Makefile.am
+++ b/specs/XIM/Makefile.am
@@ -26,5 +26,3 @@
 doc_sources = xim.ms
 
 include $(top_srcdir)/specs/troffrules.in
-
-
diff --git a/specs/i18n/Makefile.am b/specs/i18n/Makefile.am
index 812ad01..7d3ac80 100644
--- a/specs/i18n/Makefile.am
+++ b/specs/i18n/Makefile.am
@@ -23,8 +23,6 @@
 
 # Based on xc/doc/specs/i18n/Makefile from X11R6.9
 
-doc_sources = Framework.ms LocaleDB.ms Trans.ms 
+doc_sources = Framework.ms LocaleDB.ms Trans.ms
 
 include $(top_srcdir)/specs/troffrules.in
-
-
diff --git a/specs/libX11/Makefile.am b/specs/libX11/Makefile.am
index a9b813a..7cf269f 100644
--- a/specs/libX11/Makefile.am
+++ b/specs/libX11/Makefile.am
@@ -54,6 +54,3 @@ doc_includes = \
 include $(top_srcdir)/specs/troffrules.in
 
 EXTRA_DIST += $(doc_includes)
-
-
-
diff --git a/specs/troffrules.in b/specs/troffrules.in
index d4e44a0..af89120 100644
--- a/specs/troffrules.in
+++ b/specs/troffrules.in
@@ -33,13 +33,36 @@ endif
 
 if ENABLE_SPECS
 if HAVE_GROFF_MS
-doc_DATA =	$(doc_sources:.ms=.txt) \
+spec_DATA =	$(doc_sources:.ms=.txt) \
 		$(doc_sources:.ms=$(printable_format)) \
 		$(doc_sources:.ms=.html)
+specdir = $(docdir)/$(subdir)
+imagesdir = $(specdir)/images
 
-CLEANFILES = $(doc_DATA)
+CLEANFILES = $(spec_DATA)
 MOSTLYCLEANFILES = index.*
 
+# Install html generated images for specs
+install-data-local:
+	test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)"
+	@d="$(srcdir)/images/"; \
+	list=`ls $$d`; \
+	for p in $$list; do \
+	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(imagesdir)/$$p'"; \
+	  $(specDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imagesdir)/$$p"; \
+	done;
+
+uninstall-local:
+	@if test -n $(DESTDIR)$(imagesdir); then \
+	  if test -d $(DESTDIR)$(imagesdir); then \
+	    list=`ls $(DESTDIR)$(imagesdir)`; \
+	    for p in $$list; do \
+	      echo " rm -f '$(DESTDIR)$(imagesdir)/$$p'"; \
+	      rm -f "$(DESTDIR)$(imagesdir)/$$p"; \
+	    done \
+	  fi; \
+	fi;
+
 mostlyclean-local:
 	@rm -fr images
 
-- 
1.6.0.4



More information about the xorg-devel mailing list