From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 4 Feb 2009 16:23:47 +0000 (+0100)
Subject: Fixes on last commit.
X-Git-Tag: v3.0-alpha1~37^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faefaede2fdc3fe7b2b47c63ce49c50e2512f586;p=ipfire-3.x.git

Fixes on last commit.
---

diff --git a/lfs/gcc b/lfs/gcc
index 05923a8e6..f78c6e16b 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -56,8 +56,8 @@ endef
 CFLAGS     = -pipe
 CXXFLAGS   =
 
-GMP        = $(shell grep ^VER $(DIR_LFS)/gmp  | awk '{ print $$3 }')
-MPFR       = $(shell grep ^VER $(DIR_LFS)/mpfr | awk '{ print $$3 }')
+GMP        = $(shell grep ^PKG_VER $(DIR_LFS)/gmp  | awk '{ print $$3 }')
+MPFR       = $(shell grep ^PKG_VER $(DIR_LFS)/mpfr | awk '{ print $$3 }')
 
 ifeq "$(MACHINE)" "i586"
 	CONFIGURE_ARGS = --disable-decimal-float
diff --git a/lfs/linux b/lfs/linux
index 42a923bed..73fa3650d 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -55,7 +55,7 @@ CFLAGS     =
 CXXFLAGS   =
 
 LOCALVERSION = -ipfire1
-FULLPKG_VER= $(PKG_VER)$(LOCALVERSION)
+FULLVER= $(PKG_VER)$(LOCALVERSION)
 
 # Patches
 GRSEC_PATCH    = grsecurity-2.1.12-$(PKG_VER)-200812271347.patch
diff --git a/tools/make-beautify b/tools/make-beautify
index 94d5b3911..a7bca4f4c 100644
--- a/tools/make-beautify
+++ b/tools/make-beautify
@@ -185,7 +185,7 @@ beautify() {
 } # End of beautify()
 
 get_pkg_ver() {
-	PKG_VER=`grep ^VER $1 | awk '{print $3}'`
+	PKG_VER=`grep ^PKG_VER $1 | awk '{print $3}'`
 
 	if [ -z $PKG_VER ]; then
 		PKG_VER=`grep "Exp " $1 | awk '{print $4}'`