[Xen-devel] 11: sane-make-syntax.patch

[Adam Heath <doogie@xxxxxxxxxxxxx>]

===
Name: sane-make-syntax.patch
Depends: INSTALL.patch, parallel-make.patch, prefix-DESTDIR.patch
Description: fix non-standard make/shell syntax
 Fix use of `pwd`, &&, and || true.  Also, remove ().
DiffStat:
 Makefile       |   16 ++++++++--------
 tools/Makefile |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

===
Depends: INSTALL.patch, parallel-make.patch, prefix-DESTDIR.patch
Description: fix non-standard make/shell syntax
 Fix use of `pwd`, &&, and || true.  Also, remove ().

--- xen-2.0.3.orig/tools/Makefile
+++ xen-2.0.3/tools/Makefile
@@ -23,7 +23,7 @@
        $(MAKE) -C sv install

 dist: $(TARGET)
-       $(MAKE) prefix=`pwd`/../../install dist=yes install
+       $(MAKE) prefix=$(CURDIR)/../../install dist=yes install


 clean:
--- xen-2.0.3.orig/Makefile
+++ xen-2.0.3/Makefile
@@ -40,7 +40,8 @@
        cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/

 docs.install:
-       sh ./docs/check_pkgs && $(MAKE) -C docs install || true
+       sh ./docs/check_pkgs
+       -$(MAKE) -C docs install

 xen.install tools.install: %.install:
        $(MAKE) -C $* install
@@ -65,8 +66,8 @@
 kernels: $(addsuffix -build,$(XKERNELS))

 docs:
-       sh ./docs/check_pkgs && \
-               $(MAKE) prefix=$(INSTALL_DIR) dist=yes -C docs install || true
+       sh ./docs/check_pkgs
+       -$(MAKE) dist=yes -C docs install

 # Build all the various kernels and modules
 kbuild: kernels
@@ -101,20 +102,19 @@
 install-twisted:
        wget http://www.twistedmatrix.com/products/get-current.epy
        tar -zxf Twisted-*.tar.gz
-       ( cd Twisted-* ; python setup.py install )
+       cd Twisted-* && python setup.py install

 install-logging: LOGGING=logging-0.4.9.2
 install-logging:
        [ -f $(LOGGING).tar.gz ] || wget 
http://www.red-dove.com/$(LOGGING).tar.gz
        tar -zxf $(LOGGING).tar.gz
-       ( cd $(LOGGING) && python setup.py install )
+       cd $(LOGGING) && python setup.py install

 # handy target to upgrade iptables (use rpm or apt-get in preference)
 install-iptables:
        wget http://www.netfilter.org/files/iptables-1.2.11.tar.bz2
-       tar -jxf iptables-*.tar.bz2
-       ( cd iptables-* ; \
-         make PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install)
+       tar -jxf iptables-1.2.11.tar.bz2
+       $(MAKE) -C iptables-1.2.11 PREFIX= 
KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install

 help:
        @echo 'Installation targets:'
===



-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/xen-devel