From f76e54eac1b8b13f31eab66a7488f7acec4cba8c Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Mon, 5 Jan 2015 10:41:07 +0000
Subject: [PATCH] Previous commit of Makefile do not compile on kernel
3.17/ubuntu 14.04/x64
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6321 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair-cn/GTPV1-U/GTPUAH/Makefile | 5 ++---
openair-cn/GTPV1-U/GTPURH/Makefile | 6 +++---
openair-cn/INSTALL | 12 ++++++------
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/openair-cn/GTPV1-U/GTPUAH/Makefile b/openair-cn/GTPV1-U/GTPUAH/Makefile
index 91b559f04d..8fcb74e5a7 100755
--- a/openair-cn/GTPV1-U/GTPUAH/Makefile
+++ b/openair-cn/GTPV1-U/GTPUAH/Makefile
@@ -10,7 +10,6 @@
#
####################################################################################
-include $(OPENAIR_HOME)/common/utils/Makefile.inc
export BIN_DIR ?= $(shell pwd)/Bin
KVERSION = $(shell uname -r)
KVERSION_LAST_DIGIT = $(shell echo ${KVERSION} | cut -d "." -f 3 | cut -d "-" -f 1)
@@ -20,11 +19,11 @@ EXTRA_CFLAGS += -DKVERSION=$(KVERSION_LAST_DIGIT)
all: xtlib
echo "Building for Kernel Version: $(KVERSION_LAST_DIGIT)"
- make -C $(KERNEL_DIR)/build M=$(PWD) modules
+ make -C /lib/modules/$(KVERSION)/build M=$(PWD) modules
mv xt_GTPUAH.ko $(BIN_DIR)/
clean: libclean
- make -C $(KERNEL_DIR)/build M=$(PWD) clean
+ make -C /lib/modules/$(KVERSION)/build M=$(PWD) clean
################################################################################
# The next section is used by libxt_GTPUAH
diff --git a/openair-cn/GTPV1-U/GTPURH/Makefile b/openair-cn/GTPV1-U/GTPURH/Makefile
index 1ae79c735b..af4107a904 100755
--- a/openair-cn/GTPV1-U/GTPURH/Makefile
+++ b/openair-cn/GTPV1-U/GTPURH/Makefile
@@ -10,7 +10,7 @@
#
####################################################################################
-include $(OPENAIR_HOME)/common/utils/Makefile.inc
+
export BIN_DIR ?= $(shell pwd)/Bin
KVERSION = $(shell uname -r)
KVERSION_LAST_DIGIT = $(shell echo ${KVERSION} | cut -d "." -f 3 | cut -d "-" -f 1)
@@ -20,11 +20,11 @@ EXTRA_CFLAGS += -DKVERSION=$(KVERSION_LAST_DIGIT)
all: xtlib
echo "Building for Kernel Version: $(KVERSION_LAST_DIGIT)"
- make -C $(KERNEL_DIR)/build M=$(PWD) modules
+ make -C /lib/modules/$(KVERSION)/build M=$(PWD) modules
mv xt_GTPURH.ko $(BIN_DIR)/
clean: libclean
- make -C $(KERNEL_DIR)/build M=$(PWD) clean
+ make -C /lib/modules/$(KVERSION)/build M=$(PWD) clean
################################################################################
# The next section is used by libxt_GTPURH
diff --git a/openair-cn/INSTALL b/openair-cn/INSTALL
index a1e89e18ad..2099840756 100644
--- a/openair-cn/INSTALL
+++ b/openair-cn/INSTALL
@@ -1,7 +1,7 @@
Installation Instructions
*************************
-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
Inc.
Copying and distribution of this file, with or without modification,
@@ -12,8 +12,8 @@ without warranty of any kind.
Basic Installation
==================
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
+ Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package. Some packages provide this
`INSTALL' file but do not implement all of the features documented
@@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
+an Autoconf limitation. Until the limitation is lifted, you can use
+this workaround:
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
@@ -367,4 +368,3 @@ operates.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
-
--
GitLab