#! /bin/sh /usr/share/dpatch/dpatch-run ## 006_fix_passtrough_makefiles.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad redhat-cluster-suite-2.20070427~/ccs/Makefile redhat-cluster-suite-2.20070427/ccs/Makefile --- redhat-cluster-suite-2.20070427~/ccs/Makefile 2007-04-27 09:43:21.000000000 +0200 +++ redhat-cluster-suite-2.20070427/ccs/Makefile 2007-04-27 09:43:37.000000000 +0200 @@ -10,8 +10,12 @@ ############################################################################### ############################################################################### +include ../make/defines.mk + SUBDIRS=daemon lib ccs_test ccs_tool man common +all: ${SUBDIRS} + %: set -e && \ for i in ${SUBDIRS}; do \ diff -urNad redhat-cluster-suite-2.20070427~/cman/Makefile redhat-cluster-suite-2.20070427/cman/Makefile --- redhat-cluster-suite-2.20070427~/cman/Makefile 2007-04-27 09:43:21.000000000 +0200 +++ redhat-cluster-suite-2.20070427/cman/Makefile 2007-04-27 09:43:37.000000000 +0200 @@ -11,8 +11,12 @@ ############################################################################### ############################################################################### +include ../make/defines.mk + SUBDIRS=lib cman_tool daemon qdisk init.d man +all: ${SUBDIRS} + %: set -e && \ for i in ${SUBDIRS}; do \ diff -urNad redhat-cluster-suite-2.20070427~/fence/Makefile redhat-cluster-suite-2.20070427/fence/Makefile --- redhat-cluster-suite-2.20070427~/fence/Makefile 2007-04-27 09:43:21.000000000 +0200 +++ redhat-cluster-suite-2.20070427/fence/Makefile 2007-04-27 09:43:37.000000000 +0200 @@ -11,8 +11,12 @@ ############################################################################### ############################################################################### +include ../make/defines.mk + SUBDIRS=agents fence_node fence_tool fenced man +all: ${SUBDIRS} + %: set -e && \ for i in ${SUBDIRS}; do \ diff -urNad redhat-cluster-suite-2.20070427~/fence/agents/Makefile redhat-cluster-suite-2.20070427/fence/agents/Makefile --- redhat-cluster-suite-2.20070427~/fence/agents/Makefile 2007-04-27 09:43:21.000000000 +0200 +++ redhat-cluster-suite-2.20070427/fence/agents/Makefile 2007-04-27 09:43:37.000000000 +0200 @@ -13,15 +13,17 @@ include ../../make/defines.mk -AGENTS = apc bladecenter brocade bullpap drac egenera ilo ipmilan -AGENTS += manual mcdata rps10 rsa rsb scsi sanbox2 vixel wti xvm +SUBDIRS = apc bladecenter brocade bullpap drac egenera ilo ipmilan +SUBDIRS += manual mcdata rps10 rsa rsb scsi sanbox2 vixel wti xvm -DISABLEDAGENTS = baytech cpint ibmblade primergy rackswitch -DISABLEDAGENTS += rib vmware xcat xen zvm +DISABLEDSUBDIRS = baytech cpint ibmblade primergy rackswitch +DISABLEDSUBDIRS += rib vmware xcat xen zvm + +all: ${SUBDIRS} %: set -e && \ - for i in ${AGENTS}; do \ + for i in ${SUBDIRS}; do \ if [ "$$i" = "xvm" ] && [ "${enable_xen}" != "1" ] && [ "$@" = "all" ]; then \ continue; \ else \ diff -urNad redhat-cluster-suite-2.20070427~/gfs/Makefile redhat-cluster-suite-2.20070427/gfs/Makefile --- redhat-cluster-suite-2.20070427~/gfs/Makefile 2007-04-27 09:43:21.000000000 +0200 +++ redhat-cluster-suite-2.20070427/gfs/Makefile 2007-04-27 09:43:37.000000000 +0200 @@ -15,6 +15,8 @@ SUBDIRS=libgfs gfs_debug gfs_edit gfs_fsck gfs_grow gfs_jadd gfs_mkfs gfs_quota gfs_tool man init.d +all: ${SUBDIRS} + %: set -e && \ for i in ${SUBDIRS}; do \ diff -urNad redhat-cluster-suite-2.20070427~/gfs2/Makefile redhat-cluster-suite-2.20070427/gfs2/Makefile --- redhat-cluster-suite-2.20070427~/gfs2/Makefile 2007-04-27 09:43:21.000000000 +0200 +++ redhat-cluster-suite-2.20070427/gfs2/Makefile 2007-04-27 09:43:37.000000000 +0200 @@ -15,6 +15,8 @@ SUBDIRS=libgfs2 convert edit fsck mkfs mount quota tool man init.d +all: ${SUBDIRS} + %: set -e && \ for i in ${SUBDIRS}; do \ diff -urNad redhat-cluster-suite-2.20070427~/gnbd/Makefile redhat-cluster-suite-2.20070427/gnbd/Makefile --- redhat-cluster-suite-2.20070427~/gnbd/Makefile 2007-04-27 09:43:21.000000000 +0200 +++ redhat-cluster-suite-2.20070427/gnbd/Makefile 2007-04-27 09:43:37.000000000 +0200 @@ -11,8 +11,12 @@ ############################################################################### ############################################################################### +include ../make/defines.mk + SUBDIRS=utils client server tools man +all: ${SUBDIRS} + %: set -e && \ for i in ${SUBDIRS}; do \ diff -urNad redhat-cluster-suite-2.20070427~/gnbd/tools/Makefile redhat-cluster-suite-2.20070427/gnbd/tools/Makefile --- redhat-cluster-suite-2.20070427~/gnbd/tools/Makefile 2007-04-27 09:43:21.000000000 +0200 +++ redhat-cluster-suite-2.20070427/gnbd/tools/Makefile 2007-04-27 09:43:37.000000000 +0200 @@ -11,8 +11,12 @@ ############################################################################### ############################################################################### +include ../../make/defines.mk + SUBDIRS=fence_gnbd gnbd_export gnbd_import +all: ${SUBDIRS} + %: set -e && \ for i in ${SUBDIRS}; do \ diff -urNad redhat-cluster-suite-2.20070427~/rgmanager/Makefile redhat-cluster-suite-2.20070427/rgmanager/Makefile --- redhat-cluster-suite-2.20070427~/rgmanager/Makefile 2007-04-27 09:43:21.000000000 +0200 +++ redhat-cluster-suite-2.20070427/rgmanager/Makefile 2007-04-27 09:43:37.000000000 +0200 @@ -11,8 +11,12 @@ ############################################################################### ############################################################################### +include ../make/defines.mk + SUBDIRS=src man init.d +all: ${SUBDIRS} + %: set -e && \ for i in ${SUBDIRS}; do \ diff -urNad redhat-cluster-suite-2.20070427~/rgmanager/src/Makefile redhat-cluster-suite-2.20070427/rgmanager/src/Makefile --- redhat-cluster-suite-2.20070427~/rgmanager/src/Makefile 2007-04-27 09:43:21.000000000 +0200 +++ redhat-cluster-suite-2.20070427/rgmanager/src/Makefile 2007-04-27 09:43:37.000000000 +0200 @@ -11,8 +11,12 @@ ############################################################################### ############################################################################### +include ../../make/defines.mk + SUBDIRS=resources clulib daemons utils +all: ${SUBDIRS} + %: set -e && \ for i in ${SUBDIRS}; do \