Skip to content

Commit

Permalink
No longer require docbook2x tools Include plain radsecproxy.conf.5 ma…
Browse files Browse the repository at this point in the history
…npage
  • Loading branch information
Fabian Mauchle committed Jul 17, 2018
1 parent c9fa726 commit eace419
Show file tree
Hide file tree
Showing 6 changed files with 846 additions and 1,082 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ TAGS
radsecproxy
radsecproxy-conf
radsecproxy-hash
radsecproxy.conf.5

5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
changes since 1.7.1

Misc:
- No longer require docbook2x tools, but include plain manpages

2018-07-05 1.7.1

License and copyright changes:
Expand Down
9 changes: 0 additions & 9 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@

AUTOMAKE_OPTIONS = foreign

if HAVE_DOCBOOK2X_MAN
GENMANPAGES = radsecproxy.conf.5
endif

SUBDIRS = tests

sbin_PROGRAMS = radsecproxy
Expand Down Expand Up @@ -59,15 +55,10 @@ EXTRA_DIST = \
tools/README tools/naptr-eduroam.sh tools/radsec-dynsrv.sh

####################
radsecproxy.conf.5: $(srcdir)/radsecproxy.conf.5.xml
$(DOCBOOK2X_MAN) $<

html: radsecproxy.html radsecproxy-hash.html radsecproxy.conf.html

%.html: %.1
groff -mandoc -Thtml $< >$@
%.html: %.5
groff -mandoc -Thtml $< >$@

clean-local:
-rm $(GENMANPAGES)
7 changes: 0 additions & 7 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,6 @@ if test "x$dtls" = "xyes" ; then
TARGET_CFLAGS="$TARGET_CFLAGS -DRADPROT_DTLS"
fi

AC_ARG_VAR([DOCBOOK2X_MAN], [docbook2x-man program to use])
if test -z "$DOCBOOK2X_MAN" ; then
AC_SUBST([DOCBOOK2X_MAN], [docbook2x-man])
fi
AC_CHECK_PROG([DOCBOOK2X_MAN_PROG], [$DOCBOOK2X_MAN], [yes])
AM_CONDITIONAL(HAVE_DOCBOOK2X_MAN, test "$DOCBOOK2X_MAN_PROG" = "yes")

AC_SUBST(TARGET_CFLAGS)
AC_SUBST(TARGET_LDFLAGS)
AX_CHECK_SSL
Expand Down
Loading

0 comments on commit eace419

Please sign in to comment.