From: Florian Fainelli <florian@openwrt.org>
Date: Wed, 25 Jul 2007 14:38:32 +0000 (+0000)
Subject: Move freeradius libs to /usr/lib since the configure script does not honnor the libdi... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=51b984e19d47b12c46c4ba6d76431c830b040d15;p=openwrt%2Fsvn-archive%2Farchive.git

Move freeradius libs to /usr/lib since the configure script does not honnor the libdir/libexecdir paths (#1837)


SVN-Revision: 8158
---

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 6ccfe2be97..009f14740f 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -32,7 +32,7 @@ endef
 
 define Package/freeradius
   $(call Package/freeradius/Default)
-  DEPENDS:=+libltdl +libopenssl +libpthread
+  DEPENDS:=+libltdl +libopenssl +libpthread +libreadline
   TITLE:=A flexible RADIUS server
   MENU:=1
 endef
@@ -288,11 +288,11 @@ endif
 
 define Build/Configure
 	$(call Build/Configure/Default, \
-		--libdir=/usr/lib/freeradius \
-		--libexecdir=/usr/lib/freeradius \
+		--libdir=/usr/lib/ \
+		--libexecdir=/usr/lib/ \
 		$(PKG_CONFIGURE_ARGS) \
 		, \
-		LDFLAGS="$$$$LDFLAGS -L$(PKG_INSTALL_DIR)/usr/lib/freeradius" \
+		LDFLAGS="$$$$LDFLAGS -L$(PKG_INSTALL_DIR)/usr/lib/" \
 		LIBS="$(PKG_CONFIGURE_LIBS)" \
 		MYSQL_CONFIG="no" \
 	)
@@ -317,8 +317,8 @@ define Package/freeradius/install
 		$(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary.$$$${f} $(1)/usr/share/freeradius/ ; \
 		$(SED) "s,^#\(\$$$$INCLUDE dictionary\.$$$${f}\),\1,g" $(1)/usr/share/freeradius/dictionary ; \
 	done
-	$(INSTALL_DIR) $(1)/usr/lib/freeradius
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/libradius{,-*}.so $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libradius{,-*}.so $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/radiusd $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -343,9 +343,9 @@ endef
 
 define BuildPlugin
   define Package/$(1)/install
-	[ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/freeradius
+	[ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/
 	for m in $(2); do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/$$$$$$$${m}{,-*}.so $$(1)/usr/lib/freeradius/ ; \
+		$(CP) $(PKG_INSTALL_DIR)/usr/lib/$$$$$$$${m}{,-*}.so $$(1)/usr/lib/ ; \
 	done
 	[ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/etc/freeradius
 	for f in $(3); do \