[commits] r1952 - in /trunk/libc: ChangeLog.eglibc option-groups.mak

[jimb@xxxxxxxxxx]

Author: jimb
Date: Wed Apr 11 18:30:57 2007
New Revision: 1952

Log:
	* option-groups.mak: Use '../' if $(..) is unset.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/option-groups.mak

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Wed Apr 11 18:30:57 2007
@@ -1,3 +1,7 @@
+2007-04-11  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
+
+	* option-groups.mak: Use '../' if $(..) is unset.
+
 2007-03-31  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
 
 	Add the OPTION_EGLIBC_LIBM option group.

Modified: trunk/libc/option-groups.mak
==============================================================================
--- trunk/libc/option-groups.mak (original)
+++ trunk/libc/option-groups.mak Wed Apr 11 18:30:57 2007
@@ -8,7 +8,8 @@
 option_group_config_file ?= $(objdir)/option-groups.config
 
 # Read the default settings for all options.
-include $(..)option-groups.defaults
+# We're included before ../Rules, so we can't assume $(..) is set.
+include $(firstword $(..) ../)option-groups.defaults
 
 # Read the developer's option group selections, overriding the
 # defaults from option-groups.defaults.