netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Pavel Šimerda" <pavlix@pavlix.net>
To: netdev@vger.kernel.org
Cc: stephen@networkplumber.org, psimerda@redhat.com
Subject: [PATCH 2/7] turn Makefile more distribution friendly
Date: Mon, 13 Apr 2015 16:00:56 +0200	[thread overview]
Message-ID: <1428933661-8193-2-git-send-email-pavlix@pavlix.net> (raw)

From: Pavel Šimerda <psimerda@redhat.com>

Changes:

 * Accept directory settings from environment.
 * Remove redundant ROOTDIR variable.
 * Set KERNEL_INCLUDE default to '/usr/include'.
 * Use CFLAGS from environemnt.

Note: In the long term it might be better to improve the configure
script to generate those parts of the Makefile in a manner similar
to autoconf. It might be even practical to autotoolize the package.

Signed-off-by: Pavel Šimerda <psimerda@redhat.com>
---
 Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 9dbb29f..18faee4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
-ROOTDIR=$(DESTDIR)
-PREFIX=/usr
-LIBDIR=$(PREFIX)/lib
-SBINDIR=/sbin
-CONFDIR=/etc/iproute2
-DATADIR=$(PREFIX)/share
-DOCDIR=$(DATADIR)/doc/iproute2
-MANDIR=$(DATADIR)/man
-ARPDDIR=/var/lib/arpd
+PREFIX?=/usr
+LIBDIR?=$(PREFIX)/lib
+SBINDIR?=/sbin
+CONFDIR?=/etc/iproute2
+DATADIR?=$(PREFIX)/share
+DOCDIR?=$(DATADIR)/doc/iproute2
+MANDIR?=$(DATADIR)/man
+ARPDDIR?=/var/lib/arpd
+KERNEL_INCLUDE?=/usr/include
 
 # Path to db_185.h include
-DBM_INCLUDE:=$(ROOTDIR)/usr/include
+DBM_INCLUDE:=$(DESTDIR)/usr/include
 
 SHARED_LIBS = y
 
@@ -33,7 +33,7 @@ CCOPTS = -O2
 WFLAGS := -Wall -Wstrict-prototypes  -Wmissing-prototypes
 WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2
 
-CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
+CFLAGS := $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(CFLAGS)
 YACCFLAGS = -d -t -v
 
 SUBDIRS=lib ip tc bridge misc netem genl man
-- 
2.3.5

             reply	other threads:[~2015-04-13 14:10 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-13 14:00 Pavel Šimerda [this message]
2015-04-13 14:00 ` [PATCH 3/7] ip-xfrm: support 'proto any' with 'sport' and 'dport' Pavel Šimerda
2015-04-13 14:00 ` [PATCH 4/7] cbq: fix find syntax in example Pavel Šimerda
2015-04-13 14:00 ` [PATCH 5/7] ip-route: don't hide routes with RTM_F_CLONED by default Pavel Šimerda
2015-05-04 15:37   ` Stephen Hemminger
2015-05-04 18:37     ` David Miller
2015-05-11 17:48       ` Pavel Šimerda
2015-04-13 14:01 ` [PATCH 6/7] lnstat: dump to stdout, not stderr Pavel Šimerda
2015-04-13 14:01 ` [PATCH 7/7] lnstat: run indefinitely by default Pavel Šimerda
2015-04-20 16:55 ` [PATCH 2/7] turn Makefile more distribution friendly Stephen Hemminger
2015-04-21 15:32   ` Pavel Šimerda

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1428933661-8193-2-git-send-email-pavlix@pavlix.net \
    --to=pavlix@pavlix.net \
    --cc=netdev@vger.kernel.org \
    --cc=psimerda@redhat.com \
    --cc=stephen@networkplumber.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).