From: BVK Chaitanya <bvk@dbook>
Date: Fri, 20 Aug 2010 05:40:42 +0000 (+0530)
Subject: minor fixes
X-Git-Tag: 1.99~647^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02a6605e7e9528b06ae466893784a35a5eb20342;p=thirdparty%2Fgrub.git

minor fixes
---

diff --git a/conf/Makefile.common b/conf/Makefile.common
index db3c13c73..47067596b 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -28,7 +28,7 @@ endif
 
 # Other options
 
-CPPFLAGS_DEFAULT = -DGRUB_FILE=\"`basename $<`\"
+CPPFLAGS_DEFAULT = -DGRUB_FILE=\"`echo $< | sed "s@$(top_srcdir)/@@g"`\"
 CPPFLAGS_DEFAULT += -I$(builddir)
 CPPFLAGS_DEFAULT += -I$(srcdir)
 CPPFLAGS_DEFAULT += -I$(top_builddir)
@@ -42,6 +42,7 @@ CFLAGS_KERNEL = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
 LDFLAGS_KERNEL = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N -static-libgcc
 CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
 CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+STRIPFLAGS_KERNEL = -R .rel.dyn -R .reginfo -R .note -R .comment
 
 CFLAGS_MODULE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
 LDFLAGS_MODULE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N,-r,-d
diff --git a/gentpl.py b/gentpl.py
index eb790751c..632b4c13e 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -100,7 +100,7 @@ def if_platform_tagged(platform, tag, snippet_if, snippet_else=None):
     for group in RMAP[platform]:
         r += "[+ = \"" + group + "\" +]" + snippet_if
 
-    if snippet_else != None: r += "[+ * +]" + snippet_if
+    if snippet_else != None: r += "[+ * +]" + snippet_else
     r += "[+ ESAC +][+ ENDFOR +]"
 
     if snippet_else == None: