xorg: Changes to 'xsf-docs'
xsf-docs/Makefile | 16 +++++++++++++++-
xsf-docs/index.mdwn | 4 ++--
2 files changed, 17 insertions(+), 3 deletions(-)
New commits:
commit 616dd2f39486d55204fc487472cd4bbcc4e09752
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 16:26:56 2011 +0100
index: Mention the path to xsf-docs.
diff --git a/xsf-docs/index.mdwn b/xsf-docs/index.mdwn
index 94d173f..f9dcfcb 100644
--- a/xsf-docs/index.mdwn
+++ b/xsf-docs/index.mdwn
@@ -3,8 +3,8 @@
*The “X Strike Force” takes care of packaging X.Org for Debian.*
These documents are shipped in the
-[xserver-xorg](http://packages.debian.org/xserver-xorg&exact=1) metapackage starting
-with `wheezy`.
+[xserver-xorg](http://packages.debian.org/xserver-xorg&exact=1)
+metapackage (under `/usr/share/doc/xorg`), starting with `wheezy`.
## Howtos
commit 4c9431d23bffc4328bafd4b097fbc0ffad187fa5
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 8 15:09:36 2011 +0100
index: xsf-docs are shipped in xserver-xorg instead.
It is more widely used as a dependency of other packages than xorg.
diff --git a/xsf-docs/index.mdwn b/xsf-docs/index.mdwn
index 5bc16ae..94d173f 100644
--- a/xsf-docs/index.mdwn
+++ b/xsf-docs/index.mdwn
@@ -3,7 +3,7 @@
*The “X Strike Force” takes care of packaging X.Org for Debian.*
These documents are shipped in the
-[xorg](http://packages.debian.org/xorg&exact=1) metapackage starting
+[xserver-xorg](http://packages.debian.org/xserver-xorg&exact=1) metapackage starting
with `wheezy`.
commit fbe84b0cac6f386d5d3822f8b2774217e54859fd
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Feb 7 07:02:18 2011 +0100
makefile: Add an install target.
diff --git a/xsf-docs/Makefile b/xsf-docs/Makefile
index 2ea63c1..4144528 100644
--- a/xsf-docs/Makefile
+++ b/xsf-docs/Makefile
@@ -15,6 +15,8 @@ CSS_FILE = xsf.css
SVG_LOGO = xsf.svg
PNG_LOGO = xsf.png
+all_files = $(html_pages) $(pdf_files) $(txt_files) $(CSS_FILE) $(SVG_LOGO) $(PNG_LOGO)
+
all: html pdf txt $(PNG_LOGO)
html: $(html_pages)
@@ -39,6 +41,18 @@ txt: $(txt_files)
$(PNG_LOGO): $(SVG_LOGO)
inkscape $< -e $@
+install: $(all_files)
+ @if [ -z "$(DESTDIR)" ]; then \
+ echo 'E: DESTDIR is not set, not installing.'; exit 1; \
+ fi
+ mkdir -p $(DESTDIR)
+ # There are probably better ways:
+ set -e; for i in $(all_files); do \
+ d=$(DESTDIR)/`dirname $$i` && \
+ mkdir -p $$d && \
+ install $$i $$d; \
+ done
+
clean:
@echo "Removing all generated files"
rm -f $(html_pages) $(pdf_files) $(txt_files)
commit b14104b977acb828f0665c5b0bbc7a28e56433ad
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Feb 7 01:30:47 2011 +0100
Fix comment, all generated files are removed.
diff --git a/xsf-docs/Makefile b/xsf-docs/Makefile
index 32aded3..2ea63c1 100644
--- a/xsf-docs/Makefile
+++ b/xsf-docs/Makefile
@@ -40,7 +40,7 @@ $(PNG_LOGO): $(SVG_LOGO)
inkscape $< -e $@
clean:
- @echo "Removing all generated html files"
+ @echo "Removing all generated files"
rm -f $(html_pages) $(pdf_files) $(txt_files)
Reply to: