Author: waldi Date: Mon May 12 14:12:06 2008 New Revision: 559 Log: debian/patches/tools-prefix.diff: Remove unused patch. Modified: trunk/xen-3/debian/patches/tools-prefix.diff Modified: trunk/xen-3/debian/patches/tools-prefix.diff =============================================================================--- trunk/xen-3/debian/patches/tools-prefix.diff (original) +++ trunk/xen-3/debian/patches/tools-prefix.diff Mon May 12 14:12:06 2008 @@ -77,28 +77,15 @@ clean: --- xen-3.orig/tools/python/Makefile +++ xen-3/tools/python/Makefile -@@ -24,7 +24,7 @@ - - .PHONY: build buildpy - buildpy: xsm.py -- CC="$(CC)" CFLAGS="$(CFLAGS)" XEN_SECURITY_MODULE="$(XEN_SECURITY_MODULE)" python setup.py build -+ CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" XEN_SECURITY_MODULE="$(XEN_SECURITY_MODULE)" python setup.py build - - build: buildpy refresh-pot refresh-po $(CATALOGS) - -@@ -77,10 +77,10 @@ +@@ -77,7 +77,7 @@ ifndef XEN_PYTHON_NATIVE_INSTALL install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin; print auxbin.libpath()") install: install-messages install-dtd - CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --force --install-lib="$(DESTDIR)$(LIBPATH)/python" -+ CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py install --home="$(DESTDIR)/usr/$(LIBDIR)" --install-lib=$(DESTDIR)/usr/$(LIBDIR)/python --force ++ CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr/$(LIBDIR)" --install-lib=$(DESTDIR)/usr/$(LIBDIR)/python --force else install: install-messages install-dtd -- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force -+ CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py install --root="$(DESTDIR)" --force - endif - - install-dtd: all + CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force --- xen-3.orig/tools/xcutils/Makefile +++ xen-3/tools/xcutils/Makefile @@ -11,7 +11,7 @@ @@ -206,16 +193,6 @@ $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1 $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8 ---- xen-3.orig/tools/ioemu/Makefile.target -+++ xen-3/tools/ioemu/Makefile.target -@@ -206,6 +206,7 @@ - ifdef CONFIG_SOLARIS - LIBS+=-lsocket -lnsl -lresolv - endif -+LIBS+=$(RPATH_ARG) - - # profiling code - ifdef TARGET_GPROF --- xen-3.orig/tools/ioemu/configure +++ xen-3/tools/ioemu/configure @@ -594,9 +594,9 @@