Update Makefiles
Makefile patch to include libwrap and libsensors libraries and install extra MIB files. Reviewed-by: Craig Small <csmall@debian.org> Last-Update: 2019-02-07 Gbp-Pq: Name 03_makefiles.patch
This commit is contained in:
parent
01543d3031
commit
7a42910835
|
@ -173,7 +173,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt
|
||||||
#
|
#
|
||||||
# override LD_RUN_PATH to avoid dependencies on the build directory
|
# override LD_RUN_PATH to avoid dependencies on the build directory
|
||||||
perlmodules: perlmakefiles subdirs
|
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 \
|
if test $$? != 0 ; then \
|
||||||
exit 1 ; \
|
exit 1 ; \
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -28,6 +28,7 @@ man8dir = $(mandir)/man8
|
||||||
snmplibdir = $(datadir)/snmp
|
snmplibdir = $(datadir)/snmp
|
||||||
mibdir = $(snmplibdir)/mibs
|
mibdir = $(snmplibdir)/mibs
|
||||||
persistentdir = @PERSISTENT_DIRECTORY@
|
persistentdir = @PERSISTENT_DIRECTORY@
|
||||||
|
sysconfdir = @sysconfdir@
|
||||||
DESTDIR = @INSTALL_PREFIX@
|
DESTDIR = @INSTALL_PREFIX@
|
||||||
INSTALL_PREFIX = $(DESTDIR)
|
INSTALL_PREFIX = $(DESTDIR)
|
||||||
|
|
||||||
|
|
|
@ -101,7 +101,7 @@ tkmib.made: $(srcdir)/tkmib
|
||||||
|
|
||||||
mib2c.made: $(srcdir)/mib2c
|
mib2c.made: $(srcdir)/mib2c
|
||||||
if test "x$(PERL)" != "x" ; then \
|
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 \
|
else \
|
||||||
touch mib2c.made; \
|
touch mib2c.made; \
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -47,11 +47,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 \
|
UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
|
||||||
UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
|
UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
|
||||||
|
|
||||||
|
EXTRAMIBS = GNOME-SMI LM-SENSORS-MIB
|
||||||
|
|
||||||
DEFAULTMIBS = @default_mibs_install@
|
DEFAULTMIBS = @default_mibs_install@
|
||||||
|
|
||||||
MIBS = $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \
|
MIBS = $(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS) $(EXTRAMIBS)
|
||||||
$(AGENTMIBS) $(IANAMIBS) \
|
|
||||||
$(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS)
|
|
||||||
|
|
||||||
all: standardall
|
all: standardall
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue