Fixes on last commit.

diff --git a/lfs/gcc b/lfs/gcc
index 05923a8e6c00a1aed26ac680acc7f0fc8bea60cc..f78c6e16bf9a17ce59acccd550d72cbd93a5cb52 100644 (file)
--- 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 42a923bed71f147ead7909668dc30fd0a41051d7..73fa3650d91e8e5220355445ece4f2d63c55732b 100644 (file)
--- 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 94d5b3911cfef5c532b56cf0f55068e8a4b82512..a7bca4f4cd76e8f0560ec0fc85dc5727e8ce12b1 100644 (file)
--- 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}'`