|
Check-in Number:
|
3576 | |
| Date: |
2003-Sep-09 14:50:04 (local)
2003-Sep-09 12:50:04 (UTC) |
| User: | thl |
| Branch: | |
| Comment: |
flush pending changes before tagging |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/snmpdx/AUTHORS 1.1 -> 1.2
--- AUTHORS 2003/09/09 09:24:28 1.1
+++ AUTHORS 2003/09/09 12:50:04 1.2
@@ -5,7 +5,7 @@
|_|_|_| \___/|____/____/|_|
OSSP snmpdx - SNMP Daemon Extension
- Version 0.2.0 (09-Sep-2003)
+ Version 0.2.1 (09-Sep-2003)
____________________________________________________________________
AUTHORS
|
|
ossp-pkg/snmpdx/ChangeLog 1.1 -> 1.2
--- ChangeLog 2003/09/09 09:24:28 1.1
+++ ChangeLog 2003/09/09 12:50:04 1.2
@@ -5,7 +5,7 @@
|_|_|_| \___/|____/____/|_|
OSSP snmpdx - SNMP Daemon Extension
- Version 0.2.0 (09-Sep-2003)
+ Version 0.2.1 (09-Sep-2003)
____________________________________________________________________
ChangeLog
|
|
ossp-pkg/snmpdx/INSTALL 1.1 -> 1.2
--- INSTALL 2003/09/09 09:24:28 1.1
+++ INSTALL 2003/09/09 12:50:04 1.2
@@ -5,7 +5,7 @@
|_|_|_| \___/|____/____/|_|
OSSP snmpdx - SNMP Daemon Extension
- Version 0.2.0 (09-Sep-2003)
+ Version 0.2.1 (09-Sep-2003)
____________________________________________________________________
INSTALLATION
|
|
ossp-pkg/snmpdx/Makefile.in 1.1 -> 1.2
--- Makefile.in 2003/09/09 09:24:28 1.1
+++ Makefile.in 2003/09/09 12:50:04 1.2
@@ -28,29 +28,50 @@
@SET_MAKE@
-SHELL = /bin/sh
-SHTOOL = ./shtool
-RM = rm -f
-SED = sed
-POD2MAN = pod2man
-PERL = @PATH_PERL@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-includedir = @includedir@
-mandir = @mandir@
+SHELL = /bin/sh
+SHTOOL = ./shtool
+RM = rm -f
+SED = sed
+POD2MAN = pod2man
+PERL = @PATH_PERL@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+sysconfdir = @sysconfdir@
+libexecdir = @libexecdir@
+includedir = @includedir@
+mandir = @mandir@
+datadir = @datadir@
+localstatedir = @localstatedir@
-DESTDIR =
+DESTDIR =
-all: snmpdx snmpdx.1
+all: snmpdx snmpdx.cfg snmpdx.1
snmpdx: snmpdx.pl
@$(SHTOOL) echo -e "%Bgenerating snmpdx%b"
- $(SED) -e "s;#!\@PERL\@;#!$(PERL);" \
- <snmpdx.pl >snmpdx && \
- chmod a+x snmpdx
+ V=`$(SHTOOL) version -l txt -d short VERSION`; \
+ D=`$(SHTOOL) version -l txt -d long VERSION | $(SED) -e 's;.*(;;' -e 's;).*;;'`; \
+ $(SED) \
+ -e "s;#!\@PERL\@;#!$(PERL);" \
+ -e "s;\@V\@;$$V;" \
+ -e "s;\@D\@;$$D;" \
+ -e "s;\@sysconfdir\@;$(sysconfdir);" \
+ -e "s;\@libexecdir\@;$(libexecdir);" \
+ -e "s;\@datadir\@;$(datadir);" \
+ -e "s;\@localstatedir\@;$(localstatedir);" \
+ <snmpdx.pl >snmpdx && \
+ chmod a+x snmpdx
+
+snmpdx.cfg: snmpdx.cfg.in
+ @$(SHTOOL) echo -e "%Bgenerating snmpdx.cfg%b"
+ $(SED) \
+ -e 's;\@libexecdir\@;$(libexecdir);g' \
+ -e 's;\@datadir\@;$(datadir);g' \
+ -e 's;\@localstatedir\@;$(localstatedir);g' \
+ <snmpdx.cfg.in >snmpdx.cfg
snmpdx.1: snmpdx.pod
@$(SHTOOL) echo -e "%Bgenerating snmpdx.1%b"
@@ -61,15 +82,21 @@
install: all
$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libdir)
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(sysconfdir)
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(datadir)/snmpdx/mibs
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libexecdir)
$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(localstatedir)
$(SHTOOL) install -c -m 755 snmpdx $(DESTDIR)$(bindir)/snmpdx
+ $(SHTOOL) install -c -m 644 snmpdx.cfg $(DESTDIR)$(sysconfdir)/snmpdx.cfg
+ $(SHTOOL) install -c -m 644 snmpdx.mib/*.mib $(DESTDIR)$(datadir)/snmpdx/mibs/
+ $(SHTOOL) install -c -m 644 snmpdx.d/*.pm $(DESTDIR)$(libexecdir)/
$(SHTOOL) install -c -m 644 snmpdx.1 $(DESTDIR)$(mandir)/man1/snmpdx.1
clean:
- $(RM) snmpdx snmpdx.1
+ $(RM) snmpdx snmpdx.cfg snmpdx.1
distclean: clean
$(RM) config.cache config.status config.log
- $(RM) Makefile config.h
+ $(RM) Makefile
|
|
ossp-pkg/snmpdx/README 1.1 -> 1.2
--- README 2003/09/09 09:24:28 1.1
+++ README 2003/09/09 12:50:04 1.2
@@ -5,7 +5,7 @@
|_|_|_| \___/|____/____/|_|
OSSP snmpdx - SNMP Daemon Extension
- Version 0.2.0 (09-Sep-2003)
+ Version 0.2.1 (09-Sep-2003)
ABSTRACT
|
|
ossp-pkg/snmpdx/THANKS 1.1 -> 1.2
--- THANKS 2003/09/09 09:24:28 1.1
+++ THANKS 2003/09/09 12:50:04 1.2
@@ -5,7 +5,7 @@
|_|_|_| \___/|____/____/|_|
OSSP snmpdx - SNMP Daemon Extension
- Version 0.2.0 (09-Sep-2003)
+ Version 0.2.1 (09-Sep-2003)
____________________________________________________________________
THANKS
|
|
ossp-pkg/snmpdx/VERSION 1.1 -> 1.2
--- VERSION 2003/09/09 09:24:28 1.1
+++ VERSION 2003/09/09 12:50:04 1.2
@@ -4,14 +4,14 @@
##
my $snmpdx_version = {
- 'v_hex' => 0x002200,
- 'v_short' => "0.2.0",
- 'v_long' => "0.2.0 (09-Sep-2003)",
- 'v_tex' => "This is OSSP snmpdx, Version 0.2.0 (09-Sep-2003)",
- 'v_gnu' => "OSSP snmpdx 0.2.0 (09-Sep-2003)",
- 'v_web' => "OSSP snmpdx/0.2.0",
- 'v_sccs' => "@(#)OSSP snmpdx 0.2.0 (09-Sep-2003)",
- 'v_rcs' => "\$Id: VERSION,v 1.1 2003/09/09 09:24:28 thl Exp $/"
+ 'v_hex' => 0x002201,
+ 'v_short' => "0.2.1",
+ 'v_long' => "0.2.1 (09-Sep-2003)",
+ 'v_tex' => "This is OSSP snmpdx, Version 0.2.1 (09-Sep-2003)",
+ 'v_gnu' => "OSSP snmpdx 0.2.1 (09-Sep-2003)",
+ 'v_web' => "OSSP snmpdx/0.2.1",
+ 'v_sccs' => "@(#)OSSP snmpdx 0.2.1 (09-Sep-2003)",
+ 'v_rcs' => "\$Id: VERSION,v 1.2 2003/09/09 12:50:04 thl Exp $/"
};
1;
|
|
ossp-pkg/snmpdx/configure.ac 1.1 -> 1.2
--- configure.ac 2003/09/09 09:24:28 1.1
+++ configure.ac 2003/09/09 12:50:04 1.2
@@ -49,7 +49,7 @@
AC_SET_MAKE
-AC_CONFIG_HEADERS(config.h)
+##AC_CONFIG_HEADERS(config.h)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
|
|
ossp-pkg/snmpdx/shtool 1.1 -> 1.2
--- shtool 2003/09/09 09:24:28 1.1
+++ shtool 2003/09/09 12:50:04 1.2
@@ -3241,7 +3241,7 @@
vGNU="${name} ${triple} (${tim})"
vWeb="${name}/${triple}"
vSCCS="@(#)${name} ${triple} (${tim})"
- vRCS="\$Id: shtool,v 1.1 2003/09/09 09:24:28 thl Exp ${name} ${triple} (${tim}) \$"
+ vRCS="\$Id: shtool,v 1.2 2003/09/09 12:50:04 thl Exp ${name} ${triple} (${tim}) \$"
# determine string out of filename
# (do NOT try to optimize this in any way because of portability)
|
|
ossp-pkg/snmpdx/snmpdx.cfg 1.2 -> 1.3
ossp-pkg/snmpdx/snmpdx.cfg.in -> 1.1
*** /dev/null Sun Apr 28 09:08:51 2024
--- - Sun Apr 28 09:10:41 2024
***************
*** 0 ****
--- 1,8 ----
+ ##
+ ## snmpdx.cfg -- configuration file for SNMP Daemon Extension
+ ##
+
+ mibdir @datadir@/snmpdx/mibs:@datadir@/snmp/mibs
+ probedir @libexecdir@
+ logfile @localstatedir@/snmpdx.log
+
|
|
ossp-pkg/snmpdx/snmpdx.pl 1.1 -> 1.2
--- snmpdx.pl 2003/09/09 09:24:28 1.1
+++ snmpdx.pl 2003/09/09 12:50:04 1.2
@@ -35,8 +35,8 @@
# program information
my $prg = {
'name' => 'OSSP snmpdx',
- 'version' => '0.2.0',
- 'date' => '01-Sep-2003'
+ 'version' => '@V@',
+ 'date' => '@D@'
};
## _________________________________________________________________________
@@ -475,12 +475,9 @@
package main;
-# find path to ourself
-my $myroot = "$FindBin::Bin";
-
# parameters (defaults)
my $opt = {
- 'config' => "$myroot/snmpdx.cfg",
+ 'config' => "@sysconfdir@/snmpdx.cfg",
'version' => 0,
'help' => 0,
'tmpdir' => ($ENV{TMPDIR} || $ENV{TEMPDIR} || "/tmp"),
@@ -488,11 +485,11 @@
'next' => 0,
'set' => 0,
'bindir' => "/cw/bin",
- 'probedir' => "$myroot/snmpdx.d",
+ 'probedir' => "@libexecdir@",
'probename' => "*",
- 'mibdir' => "$myroot/snmpdx.mib",
+ 'mibdir' => "@datadir@/snmpdx/mibs",
'mibname' => "snmpdx",
- 'logfile' => "$myroot/snmpdx.log",
+ 'logfile' => "@localstatedir@/snmpdx.log",
'loglevel' => 9,
'strict' => 0,
};
|
|
