diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-09-07 09:48:35 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-09-07 09:48:35 +0100 |
| commit | 787dcb588baf05031b52d567cdf56a9a465b5435 (patch) | |
| tree | 8a8c801ebacdfb4b60b29eeef386699ec5f895e2 | |
| parent | f0a09ab129e5f0a4e6de6610f77eea9005fa5eb2 (diff) | |
| download | xen-787dcb588baf05031b52d567cdf56a9a465b5435.tar.gz xen-787dcb588baf05031b52d567cdf56a9a465b5435.tar.bz2 xen-787dcb588baf05031b52d567cdf56a9a465b5435.zip | |
Check for libxml2 if security tools are to be built, and adapt the
python setup.py command line parameters to also work under SuSE.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | tools/check/Makefile | 4 | ||||
| -rwxr-xr-x | tools/check/check_xml2 | 2 | ||||
| -rw-r--r-- | tools/security/Makefile | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tools/Makefile b/tools/Makefile index c150dbd984..18205ccca8 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -10,7 +10,7 @@ SUBDIRS-y += examples SUBDIRS-y += xentrace SUBDIRS-$(CONFIG_XCUTILS) += xcutils SUBDIRS-$(CONFIG_X86) += firmware -SUBDIRS-y += security +SUBDIRS-$(ACM_SECURITY) += security SUBDIRS-y += console SUBDIRS-y += xenmon SUBDIRS-y += guest-headers diff --git a/tools/check/Makefile b/tools/check/Makefile index 98f125f048..abba3d6ab7 100644 --- a/tools/check/Makefile +++ b/tools/check/Makefile @@ -7,7 +7,7 @@ all: build # Check this machine is OK for building on. .PHONY: build build: - XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ./chk build + XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ACM_SECURITY=$(ACM_SECURITY) ./chk build # Check this machine is OK for installing on. # DO NOT use this check from 'make install' in the parent @@ -15,7 +15,7 @@ build: # copy rather than actually installing. .PHONY: install install: - XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ./chk install + XENFB_TOOLS=$(XENFB_TOOLS) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ACM_SECURITY=$(ACM_SECURITY) ./chk install .PHONY: clean clean: diff --git a/tools/check/check_xml2 b/tools/check/check_xml2 index 782feda39e..e8def042ad 100755 --- a/tools/check/check_xml2 +++ b/tools/check/check_xml2 @@ -1,7 +1,7 @@ #!/bin/sh # CHECK-BUILD CHECK-INSTALL -if [ ! "$LIBXENAPI_BINDINGS" = "y" ] +if [ ! "$LIBXENAPI_BINDINGS" = "y" -a ! "$ACM_SECURITY" = "y" ] then echo -n "unused, " exit 0 diff --git a/tools/security/Makefile b/tools/security/Makefile index b31ad41ca7..4a193596d2 100644 --- a/tools/security/Makefile +++ b/tools/security/Makefile @@ -66,7 +66,7 @@ install: all $(ACM_CONFIG_FILE) $(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR) $(INSTALL_PROG) $(ACM_INST_CGI) $(DESTDIR)$(ACM_SECGEN_CGIDIR) ifndef XEN_PYTHON_NATIVE_INSTALL - python python/setup.py install --home="$(DESTDIR)/usr" --install-lib="$(DESTDIR)$(LIBPATH)/python" + python python/setup.py install --install-lib="$(DESTDIR)$(LIBPATH)/python" else python python/setup.py install --root="$(DESTDIR)" endif |