Fix freeradius compilation (#2134)
authorFlorian Fainelli <florian@openwrt.org>
Mon, 30 Jul 2007 15:35:39 +0000 (15:35 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Mon, 30 Jul 2007 15:35:39 +0000 (15:35 +0000)
SVN-Revision: 8232

net/freeradius/Makefile

index 009f14740f62bc8f86382b782b0ea79d41955e0f..98351fc96c7d34fa2d4dce66c99ea1c93067b45f 100644 (file)
@@ -288,11 +288,11 @@ endif
 
 define Build/Configure
        $(call Build/Configure/Default, \
 
 define Build/Configure
        $(call Build/Configure/Default, \
-               --libdir=/usr/lib/ \
-               --libexecdir=/usr/lib/ \
+               --libdir=/usr/lib/freeradius \
+               --libexecdir=/usr/lib/freeradius \
                $(PKG_CONFIGURE_ARGS) \
                , \
                $(PKG_CONFIGURE_ARGS) \
                , \
-               LDFLAGS="$$$$LDFLAGS -L$(PKG_INSTALL_DIR)/usr/lib/" \
+               LDFLAGS="$$$$LDFLAGS -L$(PKG_INSTALL_DIR)/usr/lib/freeradius" \
                LIBS="$(PKG_CONFIGURE_LIBS)" \
                MYSQL_CONFIG="no" \
        )
                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
                $(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/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libradius{,-*}.so $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/freeradius
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/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
        $(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
 
 define BuildPlugin
   define Package/$(1)/install
-       [ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/
+       [ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib
        for m in $(2); do \
        for m in $(2); do \
-               $(CP) $(PKG_INSTALL_DIR)/usr/lib/$$$$$$$${m}{,-*}.so $$(1)/usr/lib/ ; \
+               $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/$$$$$$$${m}{,-*}.so $$(1)/usr/lib/ ; \
        done
        [ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/etc/freeradius
        for f in $(3); do \
        done
        [ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/etc/freeradius
        for f in $(3); do \