[Pkg-net-snmp-commits] [pkg-net-snmp] 02/27: _makefiles

[Hideki Yamane]

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch patch-queue/master
in repository pkg-net-snmp.

commit 47c4bd52280cbe7f2bb38582cea8c6c7ce8467e4
Author: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
Date:   Thu Jun 18 06:12:04 2015 +0900

    _makefiles
    
    Makefile patch to include libwrap and libsensors libraries and install extra
    MIB files.
    
    
    Gbp-Pq: Name 03_makefiles.patch
---
 Makefile.in       | 4 ++--
 Makefile.top      | 1 +
 local/Makefile.in | 2 +-
 mibs/Makefile.in  | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index cfcdf73..10f36f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,7 +17,7 @@ CPP		= @CPP@ 					        \
 
 INSTALLHEADERS=version.h net-snmp-features.h
 INCLUDESUBDIR=system
-INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \
+INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h kfreebsd.h \
 	darwin.h darwin7.h darwin8.h darwin9.h darwin10.h dragonfly.h dynix.h \
 	freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h \
 	freebsd7.h freebsd8.h freebsd9.h freebsd10.h freebsd11.h \
@@ -171,7 +171,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt
 #
 # override LD_RUN_PATH to avoid dependencies on the build directory
 perlmodules: perlmakefiles subdirs
-	@(cd perl ; $(MAKE) LD_RUN_PATH="$(libdir):`$(PERL) -e 'use Config; print qq($$Config{archlibexp}/CORE);'`") ; \
+	@(cd perl ; $(MAKE) LD_RUN_PATH="") ; \
         if test $$? != 0 ; then \
            exit 1 ; \
         fi
diff --git a/Makefile.top b/Makefile.top
index 503f61e..bf32f3c 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -27,6 +27,7 @@ man8dir		= $(mandir)/man8
 snmplibdir	= $(datadir)/snmp
 mibdir		= $(snmplibdir)/mibs
 persistentdir	= @PERSISTENT_DIRECTORY@
+sysconfdir	= @sysconfdir@
 DESTDIR         = @INSTALL_PREFIX@
 INSTALL_PREFIX  = $(DESTDIR)
 
diff --git a/local/Makefile.in b/local/Makefile.in
index cb84afc..12d7132 100644
--- a/local/Makefile.in
+++ b/local/Makefile.in
@@ -103,7 +103,7 @@ tkmib.made: $(srcdir)/tkmib
 
 mib2c.made: $(srcdir)/mib2c
 	if test "x$(PERL)" != "x" ; then \
-	  $(PERL) -p -e 's%^#!.*/perl.*%#!$(PERL)%;s#/usr/local/share/snmp#$(snmplibdir)#;' ${srcdir}/mib2c > mib2c.made; \
+	  $(PERL) -p -e 's%^#!.*/perl.*%#!$(PERL)%;s#/usr/local/share/snmp#$(snmplibdir)#;s#/usr/local/etc/snmp#$(SNMPCONFPATH)#;' ${srcdir}/mib2c > mib2c.made; \
 	else \
 	  touch mib2c.made; \
         fi
diff --git a/mibs/Makefile.in b/mibs/Makefile.in
index f185002..1ad4558 100644
--- a/mibs/Makefile.in
+++ b/mibs/Makefile.in
@@ -49,11 +49,11 @@ NETSNMPMIBS = NET-SNMP-TC.txt NET-SNMP-MIB.txt NET-SNMP-AGENT-MIB.txt \
 UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
 	UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
 
+EXTRAMIBS = GNOME-SMI LM-SENSORS-MIB
+
 DEFAULTMIBS = @default_mibs_install@
 
-MIBS	= $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \
-	$(AGENTMIBS) $(IANAMIBS) \
-	$(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS)
+MIBS	=  $(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS) $(EXTRAMIBS)
 
 all: standardall
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-net-snmp/pkg-net-snmp.git