OBS User unknown
2008-08-17 22:24:29 +00:00
committed by Git OBS Bridge
parent f5d6338f4d
commit 8cefe055e5
67 changed files with 1102 additions and 2615 deletions

View File

@@ -3,12 +3,12 @@ Index: xen-3.3.0-testing/docs/Makefile
--- xen-3.3.0-testing.orig/docs/Makefile
+++ xen-3.3.0-testing/docs/Makefile
@@ -90,7 +90,8 @@ install: all
$(INSTALL_DIR) $(DESTDIR)$(mandir)
cp -dR man1 $(DESTDIR)$(mandir)
cp -dR man5 $(DESTDIR)$(mandir)
- [ ! -d html ] || cp -dR html $(DESTDIR)$(pkgdocdir)
+ $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)/html
+ cp -dR html.done/* $(DESTDIR)$(pkgdocdir)/html
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
cp -dR man1 $(DESTDIR)$(MANDIR)
cp -dR man5 $(DESTDIR)$(MANDIR)
- [ ! -d html ] || cp -dR html $(DESTDIR)$(DOCDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)/html
+ cp -dR html.done/* $(DESTDIR)$(DOCDIR)/html
pdf/%.pdf: ps/%.ps
$(INSTALL_DIR) $(@D)
@@ -26,7 +26,7 @@ Index: xen-3.3.0-testing/tools/examples/Makefile
===================================================================
--- xen-3.3.0-testing.orig/tools/examples/Makefile
+++ xen-3.3.0-testing/tools/examples/Makefile
@@ -39,18 +39,6 @@ XEN_HOTPLUG_SCRIPTS = xen-backend.agent
@@ -47,18 +47,6 @@ XEN_HOTPLUG_SCRIPTS = xen-backend.agent
UDEV_RULES_DIR = /etc/udev
UDEV_RULES = xen-backend.rules
@@ -45,13 +45,16 @@ Index: xen-3.3.0-testing/tools/examples/Makefile
.PHONY: all
all:
@@ -58,15 +46,15 @@ all:
@@ -66,7 +54,7 @@ all:
build:
.PHONY: install
-install: all install-initd install-configs install-scripts $(HOTPLUGS)
+install: all install-initd install-configs install-scripts install-udev
-install: all install-readmes install-initd install-configs install-scripts $(HOTPLUGS)
+install: all install-readmes install-initd install-configs install-scripts install-udev
.PHONY: install-readmes
install-readmes:
@@ -80,10 +68,10 @@ install-readmes:
.PHONY: install-initd
install-initd:
[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
@@ -64,7 +67,7 @@ Index: xen-3.3.0-testing/tools/examples/Makefile
.PHONY: install-configs
install-configs: $(XEN_CONFIGS)
@@ -107,8 +95,7 @@ install-udev:
@@ -124,8 +112,7 @@ install-udev:
$(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR)/rules.d
set -e; for i in $(UDEV_RULES); \
do \
@@ -116,19 +119,6 @@ Index: xen-3.3.0-testing/tools/python/Makefile
endif
install-dtd: all
Index: xen-3.3.0-testing/docs/Docs.mk
===================================================================
--- xen-3.3.0-testing.orig/docs/Docs.mk
+++ xen-3.3.0-testing/docs/Docs.mk
@@ -8,6 +8,6 @@ POD2MAN := pod2man
DOT := dot
NEATO := neato
-pkgdocdir := /usr/share/doc/xen
-mandir := /usr/share/man
+pkgdocdir := $(DOCDIR)
+mandir := $(MANDIR)
Index: xen-3.3.0-testing/tools/xenstore/Makefile
===================================================================
--- xen-3.3.0-testing.orig/tools/xenstore/Makefile