X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Fnet-snmp%2FMakefile;h=f86a4e0ae98e5f0aeb82afdc5518fc60d9ea0c08;hb=0a93a0bc174f9905adb0942f2078bbbda3863744;hp=1aa8fd114f1aa414166bc9f11a4f5f52d2b088e4;hpb=13fb59dd0549e4f09ae3600298eda16396cb95f1;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/net-snmp/Makefile b/libs/net-snmp/Makefile
index 1aa8fd114f..f86a4e0ae9 100644
--- a/libs/net-snmp/Makefile
+++ b/libs/net-snmp/Makefile
@@ -139,6 +139,8 @@ SNMP_TRANSPORTS_INCLUDED = Callback UDP
 
 SNMP_TRANSPORTS_EXCLUDED = TCP TCPv6 UDPv6 Unix
 
+TARGET_CFLAGS += $(FPIC)
+
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
@@ -191,12 +193,6 @@ define Build/InstallDev
 	$(SED) 's,-L/usr/lib,,g' $(1)/usr/bin/net-snmp-config
 endef
 
-define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/bin/net-snmp-config \
-		$(STAGING_DIR)/usr/include/net-snmp \
-		$(STAGING_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*}
-endef
-
 define Package/libnetsnmp/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.so.* $(1)/usr/lib/
@@ -204,12 +200,14 @@ endef
 
 define Package/snmpd/conffiles
 /etc/default/snmpd
-/etc/snmp/snmpd.conf
+/etc/config/snmpd
 endef
 
 define Package/snmpd/install
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/config/snmpd
 	$(INSTALL_DIR) $(1)/etc/snmp
-	$(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/snmp/snmpd.conf
+	ln -sf /var/run/snmpd.conf $(1)/etc/snmp/
 	$(INSTALL_DIR) $(1)/etc/default
 	$(INSTALL_DATA) ./files/snmpd.default $(1)/etc/default/snmpd
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -220,12 +218,14 @@ endef
 
 define Package/snmpd-static/conffiles
 /etc/default/snmpd
-/etc/snmp/snmpd.conf
+/etc/config/snmpd
 endef
 
 define Package/snmpd-static/install
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/config/snmpd
 	$(INSTALL_DIR) $(1)/etc/snmp
-	$(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/snmp/snmpd.conf
+	ln -sf /var/run/snmpd.conf $(1)/etc/snmp/
 	$(INSTALL_DIR) $(1)/etc/default
 	$(INSTALL_DATA) ./files/snmpd.default $(1)/etc/default/snmpd
 	$(INSTALL_DIR) $(1)/etc/init.d