Author: sebor
Date: Wed Nov 15 15:38:28 2006
New Revision: 475496
URL: http://svn.apache.org/viewvc?view=rev&rev=475496
Log:
2006-11-15 Martin Sebor <[EMAIL PROTECTED]>
* GNUmakefile (CURDIR): Used the shell PWD variable to avoid
expanding NFS paths as mount points instead of the user-visible
directories.
(MAKEFILE_IN): Used "$(TOPDIR)" in the definition of the BUILDDIR
variable when generating makefile.in rather than fully expanding
the variable.
Modified:
incubator/stdcxx/trunk/GNUmakefile
Modified: incubator/stdcxx/trunk/GNUmakefile
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/GNUmakefile?view=diff&rev=475496&r1=475495&r2=475496
==============================================================================
--- incubator/stdcxx/trunk/GNUmakefile (original)
+++ incubator/stdcxx/trunk/GNUmakefile Wed Nov 15 15:38:28 2006
@@ -139,7 +139,13 @@
# provide a value if it isn't already set by (an older version of) make
ifeq ($(CURDIR),)
- CURDIR := $(shell pwd)
+ ifneq ($(PWD),)
+ # use the shell PWD variable to avoid expanding NFS paths
+ # as mount points instead of the user-visible directories
+ CURDIR := $(PWD)
+ else
+ CURDIR := $(shell pwd)
+ endif
endif
@@ -566,7 +572,8 @@
echo "generating $(MAKEFILE_IN) from $(configpath)" \
&& echo "TOPDIR = $(TOPDIR)" >> $(MAKEFILE_IN) \
&& echo "BUILDDIR = $(buildpath)" >> $(MAKEFILE_IN) \
- && echo "CONFIG = $(configpath)" >> $(MAKEFILE_IN) \
+ && echo "CONFIG = $$""(TOPDIR)/etc/config/$(CONFIG)" \
+ >> $(MAKEFILE_IN) \
&& echo "BUILDTYPE = $(BUILDTYPE)" >> $(MAKEFILE_IN) \
&& echo "BUILDMODE = $(BUILDMODE)" >> $(MAKEFILE_IN) \
&& echo "CXX = $(CXX)" >> $(MAKEFILE_IN) \
