From 187d5531b3b84cf78a6949ac8abbcd6904e1dfea Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 25 Jun 2007 15:07:25 +0000 Subject: [PATCH] - correct installation path --- package/netsnmp/netsnmp.mk | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 34b28cbe34..e30b62f3e3 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -34,9 +34,7 @@ endif $(NETSNMP_DIR)/.configured: $(NETSNMP_DIR)/.unpacked (cd $(NETSNMP_DIR); autoconf; \ ac_cv_CAN_USE_SYSCTL=no \ - PATH=$(TARGET_PATH) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_OPTS) \ ./configure \ --with-cc=$(TARGET_CROSS)gcc \ --with-ar=$(TARGET_CROSS)ar \ @@ -69,15 +67,14 @@ $(NETSNMP_DIR)/agent/snmpd: $(NETSNMP_DIR)/.configured $(MAKE1) -C $(NETSNMP_DIR) $(TARGET_DIR)/usr/sbin/snmpd: $(NETSNMP_DIR)/agent/snmpd - #$(MAKE) DESTDIR=$(TARGET_DIR) -C $(NETSNMP_DIR) install $(MAKE) PREFIX=$(TARGET_DIR)/usr \ prefix=$(TARGET_DIR)/usr \ exec_prefix=$(TARGET_DIR)/usr \ persistentdir=$(TARGET_DIR)/var/lib/snmp \ infodir=$(TARGET_DIR)/usr/info \ mandir=$(TARGET_DIR)/usr/man \ - includedir=$(STAGING_DIR)/include/net-snmp \ - ucdincludedir=$(STAGING_DIR)/include/ucd-snmp \ + includedir=$(STAGING_DIR)/usr/include/net-snmp \ + ucdincludedir=$(STAGING_DIR)/usr/include/ucd-snmp \ -C $(NETSNMP_DIR) install; rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc @@ -91,16 +88,16 @@ $(TARGET_DIR)/usr/sbin/snmpd: $(NETSNMP_DIR)/agent/snmpd # Remove the unsupported snmpcheck program rm $(TARGET_DIR)/usr/bin/snmpcheck # Install the "broken" headers - cp $(NETSNMP_DIR)/agent/mibgroup/struct.h $(STAGING_DIR)/include/net-snmp/agent - cp $(NETSNMP_DIR)/agent/mibgroup/util_funcs.h $(STAGING_DIR)/include/net-snmp - cp $(NETSNMP_DIR)/agent/mibgroup/mibincl.h $(STAGING_DIR)/include/net-snmp/library - cp $(NETSNMP_DIR)/agent/mibgroup/header_complex.h $(STAGING_DIR)/include/net-snmp/agent + cp $(NETSNMP_DIR)/agent/mibgroup/struct.h $(STAGING_DIR)/usr/include/net-snmp/agent + cp $(NETSNMP_DIR)/agent/mibgroup/util_funcs.h $(STAGING_DIR)/usr/include/net-snmp + cp $(NETSNMP_DIR)/agent/mibgroup/mibincl.h $(STAGING_DIR)/usr/include/net-snmp/library + cp $(NETSNMP_DIR)/agent/mibgroup/header_complex.h $(STAGING_DIR)/usr/include/net-snmp/agent netsnmp: openssl $(TARGET_DIR)/usr/sbin/snmpd netsnmp-headers: $(TARGET_DIR)/usr/include/net-snmp/net-snmp-config.h - cp -a $(STAGING_DIR)/include/net-snmp $(TARGET_DIR)/usr/include/net-snmp - cp -a $(STAGING_DIR)/include/ucd-snmp $(TARGET_DIR)/usr/include/net-snmp + cp -a $(STAGING_DIR)/usr/include/net-snmp $(TARGET_DIR)/usr/include/net-snmp + cp -a $(STAGING_DIR)/usr/include/ucd-snmp $(TARGET_DIR)/usr/include/net-snmp netsnmp-source: $(DL_DIR)/$(NETSNMP_SOURCE) -- 2.30.2