X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Ffreeradius%2FMakefile;h=98351fc96c7d34fa2d4dce66c99ea1c93067b45f;hp=009f14740f62bc8f86382b782b0ea79d41955e0f;hb=f3c12206cd27873165fea064f07fb1d8f6a10fc7;hpb=dbd5ec94ea2dc5dac48f45638019152ca598f392;ds=sidebyside diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 009f14740f..98351fc96c 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -288,11 +288,11 @@ endif define Build/Configure $(call Build/Configure/Default, \ - --libdir=/usr/lib/ \ - --libexecdir=/usr/lib/ \ + --libdir=/usr/lib/freeradius \ + --libexecdir=/usr/lib/freeradius \ $(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" \ ) @@ -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/ - $(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 @@ -343,9 +343,9 @@ endef 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 \ - $(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 \