merged to trunk thanks
On Wed, 2007-10-03 at 03:55 +1300, Angus Salkeld wrote: > Hi > > This patch sorts out a problem that Andrew Beekhof had. > His make didn't seem to support the abspath & realpath make > functions. > > > This patch allows for this. > > -Angus > > > Makefile | 20 +++++++++++++++++--- > 1 files changed, 17 insertions(+), 3 deletions(-) > > diff --git a/Makefile b/Makefile > index 3be5ea3..3d49d12 100644 > --- a/Makefile > +++ b/Makefile > @@ -29,14 +29,28 @@ > # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF > # THE POSSIBILITY OF SUCH DAMAGE. > > -builddir:=$(shell pwd)/ > +builddir:=$(CURDIR)/ > ifneq ($(O),) > # cleanup the path (make it absolute) > builddir:=$(abspath $(O))/ > +ifeq ($(builddir),) > +builddir:=$(O) > +$(warning your abspath function is not working) > +$(warning > setting builddir to $(builddir)) > +endif > +endif > + > +THIS_MAKEFILE:=$(realpath $(lastword $(MAKEFILE_LIST))) > + > +ifeq ($(THIS_MAKEFILE),) > +srcdir:=$(CURDIR)/ > +$(warning your realpath function is not working) > +$(warning > setting srcdir to $(srcdir)) > +else > +srcdir:=$(dir $(THIS_MAKEFILE)) > endif > -srcdir:=$(dir $(realpath $(MAKEFILE_LIST))) > > -include $(srcdir)/Makefile.inc > +include $(srcdir)Makefile.inc > > SBINDIR=$(PREFIX)/sbin > INCLUDEDIR=$(PREFIX)/include/openais > _______________________________________________ > Openais mailing list > [email protected] > https://lists.linux-foundation.org/mailman/listinfo/openais _______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
