diff mbox

[2/7] turn Makefile more distribution friendly

Message ID 1428933661-8193-2-git-send-email-pavlix@pavlix.net
State Accepted, archived
Delegated to: stephen hemminger
Headers show

Commit Message

Pavel Šimerda April 13, 2015, 2 p.m. UTC 
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(-)

Comments

Stephen Hemminger April 20, 2015, 4:55 p.m. UTC | #1 
On Mon, 13 Apr 2015 16:00:56 +0200
Pavel Šimerda <pavlix@pavlix.net> wrote:

> 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>

I will take this part.
But don't want to start iproute2 down the autoconf/autotool sink hole.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pavel Šimerda April 21, 2015, 3:32 p.m. UTC | #2 
On 04/20/2015 06:55 PM, Stephen Hemminger wrote:
> On Mon, 13 Apr 2015 16:00:56 +0200
> Pavel Šimerda <pavlix@pavlix.net> wrote:
> 
>> 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>
> 
> I will take this part.
> But don't want to start iproute2 down the autoconf/autotool sink hole.

Thanks! The changes I submitted should generally be good enough for
distro maintainers to avoid Makefile modifications.

Cheers,

Pavel
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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