[Lunar-commits] <moonbase> libnl, libnl2, libnl3, iw: Adding and adjusting BUILDs so they will install their

[Dennis `stumbles` Veatch]

commit 337bc4030c7a8f67fd8a407e5adf07ace800fe10
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Wed May 18 06:35:55 2011 -0400

    libnl, libnl2, libnl3, iw: Adding and adjusting BUILDs so they will install their
    
    libs and headhers in different locations so there is not conflicts. Each have
    their own pc file to pointed where needed. The iw module was the only one found
    that needed an adjustment.
---
 libs/libnl/BUILD       |    2 +-
 libs/libnl/CONFLICTS   |    2 --
 zbeta/iw/BUILD         |    8 ++++++++
 zbeta/iw/DEPENDS       |    2 +-
 zbeta/libnl2/BUILD     |    8 ++++++--
 zbeta/libnl2/CONFLICTS |    2 --
 zbeta/libnl3/BUILD     |    8 ++++++++
 zbeta/libnl3/CONFLICTS |    2 --
 8 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/libs/libnl/BUILD b/libs/libnl/BUILD
index ecbd08a..784fe8b 100644
--- a/libs/libnl/BUILD
+++ b/libs/libnl/BUILD
@@ -1,7 +1,7 @@
 (
 
   sed -i "29i #include <limits.h>" include/netlink-local.h  &&
-
+  
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/libs/libnl/CONFLICTS b/libs/libnl/CONFLICTS
deleted file mode 100644
index 4eff0bc..0000000
--- a/libs/libnl/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts libnl2
-conflicts libnl3
diff --git a/zbeta/iw/BUILD b/zbeta/iw/BUILD
new file mode 100644
index 0000000..7174faa
--- /dev/null
+++ b/zbeta/iw/BUILD
@@ -0,0 +1,8 @@
+(
+
+# so it does not trip on finding nl2 so files.
+  sed -i "26d" Makefile &&
+
+  default_make
+
+) > $C_FIFO 2>&1
diff --git a/zbeta/iw/DEPENDS b/zbeta/iw/DEPENDS
index 1efc679..ba94525 100644
--- a/zbeta/iw/DEPENDS
+++ b/zbeta/iw/DEPENDS
@@ -1 +1 @@
-depends libnl
+depends libnl2
diff --git a/zbeta/libnl2/BUILD b/zbeta/libnl2/BUILD
index f99d03b..10a6041 100644
--- a/zbeta/libnl2/BUILD
+++ b/zbeta/libnl2/BUILD
@@ -1,6 +1,10 @@
 (
 
-  OPTS+=" --disable-static " &&
-  default_build
+  OPTS+=" --libdir=/usr/lib/$MODULE --with-pkgconfigdir=/usr/lib/pkgconfig  \
+          --includedir=/usr/include/$MODULE --sysconfdir=/etc/$MODULE --disable-static" &&
 
+  ./autogen.sh &&
+
+  default_build                                                                                                                               
+                                                                                                                                              
 ) > $C_FIFO 2>&1
diff --git a/zbeta/libnl2/CONFLICTS b/zbeta/libnl2/CONFLICTS
deleted file mode 100644
index 719a240..0000000
--- a/zbeta/libnl2/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts libnl
-conflicts libnl3
diff --git a/zbeta/libnl3/BUILD b/zbeta/libnl3/BUILD
new file mode 100644
index 0000000..e2b5efd
--- /dev/null
+++ b/zbeta/libnl3/BUILD
@@ -0,0 +1,8 @@
+(
+
+  OPTS+=" --libdir=/usr/lib/$MODULE --with-pkgconfigdir=/usr/lib/pkgconfig   \
+          --includedir=/usr/include/$MODULE --sysconfdir=/etc/$MODULE" &&
+
+  default_build
+
+) > $C_FIFO 2>&1
diff --git a/zbeta/libnl3/CONFLICTS b/zbeta/libnl3/CONFLICTS
deleted file mode 100644
index 415eeca..0000000
--- a/zbeta/libnl3/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts libnl
-conflicts libnl2