diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-04-04 13:01:14 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-04-04 13:01:14 +0000 |
| commit | 703a7cdd5ad2d835ddcd17d107af66e49e425f5a (patch) | |
| tree | aeb87818634cf0846f02bd422c45426a3c4c000f /misc | |
| parent | 79ac75e69e505a0d8881d27d7f2fe874c89351e6 (diff) | |
Fix pascal build problem
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4554 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/pascal/ChangeLog | 6 | ||||
| -rw-r--r-- | misc/pascal/nuttx/Makefile | 6 |
2 files changed, 9 insertions, 3 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 <spudmonkey@racsa.co.cr> 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 <gnutt@nuttx.org> + + * 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 <spudmonkey@racsa.co.cr> +# Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> # # 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 |