From d3974a62b3c701c8b8777d6fc3b2991ab88f716b Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 4 Apr 2012 13:01:14 +0000 Subject: [PATCH] Fix pascal build problem git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4554 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- misc/pascal/ChangeLog | 6 ++++++ misc/pascal/nuttx/Makefile | 6 +++--- nuttx/include/pthread.h | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/misc/pascal/ChangeLog b/misc/pascal/ChangeLog index e937aa13bf..672d6d0eff 100644 --- a/misc/pascal/ChangeLog +++ b/misc/pascal/ChangeLog @@ -29,3 +29,9 @@ pascal-3.0 2010-xx-xx Gregory Nutt incompatible with will all releases of NuttX prior to nuttx-6.0 where the apps/ module was introduced. +pascal-3.1 2012-xx-xx Gregory Nutt + + * nuttx/Makefile: If DIRLINK is defined, then INCDIR is not setup + correctly and the build fails. The value of INCDIR must be + initialized unconditionally. + diff --git a/misc/pascal/nuttx/Makefile b/misc/pascal/nuttx/Makefile index 027e199156..eb82e48bd2 100644 --- a/misc/pascal/nuttx/Makefile +++ b/misc/pascal/nuttx/Makefile @@ -1,8 +1,8 @@ ############################################################################ # apps/interpreters/pcode/Makefile # -# Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -44,8 +44,8 @@ include $(APPDIR)/Make.defs ifeq ($(DIRLINK),) DIRLINK = $(TOPDIR)/tools/link.sh DIRUNLINK = $(TOPDIR)/tools/unlink.sh -INCDIR = $(TOPDIR)/tools/incdir.sh endif +INCDIR = $(TOPDIR)/tools/incdir.sh ifeq ($(WINTOOL),y) INCDIROPT = -w diff --git a/nuttx/include/pthread.h b/nuttx/include/pthread.h index b0942b85c6..092cfad935 100644 --- a/nuttx/include/pthread.h +++ b/nuttx/include/pthread.h @@ -1,8 +1,8 @@ /******************************************************************************** * include/pthread.h * - * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions