Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil Shafer committed Aug 22, 2015
2 parents 0c52525 + 48514de commit 88f2b82
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 102 deletions.
2 changes: 1 addition & 1 deletion libxo/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ call-graph:

install-data-hook:
for file in ${man_MANS}; do \
cat add.man >> ${DESTDIR}${man3dir}/$$file ; done
cat ../libxo/add.man >> ${DESTDIR}${man3dir}/$$file ; done
4 changes: 4 additions & 0 deletions xo/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@ endif
man_MANS = xo.1

EXTRA_DIST = xo.1

install-data-hook:
for file in ${man_MANS}; do \
cat ../libxo/add.man >> ${DESTDIR}${man1dir}/$$file ; done
25 changes: 0 additions & 25 deletions xo/xo.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,31 +168,6 @@ prepend data to the XPath values used for HTML output style.
<product>stereo</product>
<status>in route</status>
.Ed
.Sh ADDITIONAL DOCUMENTATION
Complete documentation can be found on github:
.Bd -literal -offset indent
http://juniper.github.io/libxo/libxo-manual.html
.Ed
.Pp
.Nm libxo
lives on github as:
.Bd -literal -offset indent
https://github.com/Juniper/libxo
.Ed
.Pp
The latest release of
.Nm libxo
is available at:
.Bd -literal -offset indent
https://github.com/Juniper/libxo/releases
.Ed
.Sh SEE ALSO
.Xr libxo 3 ,
.Xr xo_emit 3
.Sh HISTORY
The
.Nm libxo
library was added in
.Fx 11.0 .
.Sh AUTHOR
Phil Shafer
4 changes: 4 additions & 0 deletions xohtml/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,7 @@ uninstall-hook:
rm ${DESTDIR}${XO_SHAREDIR}/$$file ; done
rmdir ${DESTDIR}${XO_SHAREDIR}/external
rm -f ${DESTDIR}${bindir}/xohtml

install-data-hook:
for file in ${man_MANS}; do \
cat ../libxo/add.man >> ${DESTDIR}${man1dir}/$$file ; done
26 changes: 0 additions & 26 deletions xohtml/xohtml.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,32 +94,6 @@ the output to /tmp/src.html:
xohtml -c "du --libxo=html,warn ~/src" -f /tmp/src.html
.Ed
.Pp
.Sh ADDITIONAL DOCUMENTATION
Complete documentation can be found on github:
.Bd -literal -offset indent
http://juniper.github.io/libxo/libxo-manual.html
.Ed
.Pp
.Nm libxo
lives on github as:
.Bd -literal -offset indent
https://github.com/Juniper/libxo
.Ed
.Pp
The latest release of
.Nm libxo
is available at:
.Bd -literal -offset indent
https://github.com/Juniper/libxo/releases
.Ed
.Sh SEE ALSO
.Xr libxo 3 ,
.Xr xo_emit 3
.Sh HISTORY
The
.Nm libxo
library was added in
.Fx 11.0 .
.Sh AUTHOR
Phil Shafer

4 changes: 4 additions & 0 deletions xolint/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ install-exec-hook:

uninstall-hook:
rm -f ${DESTDIR}${bindir}/xolint

install-data-hook:
for file in ${man_MANS}; do \
cat ../libxo/add.man >> ${DESTDIR}${man1dir}/$$file ; done
25 changes: 0 additions & 25 deletions xolint/xolint.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,31 +74,6 @@ line that contains the error:
xolint.c: 16: error: anchor format should be "%d"
16 xo_emit("{[:/%s}");
.Ed
.Sh ADDITIONAL DOCUMENTATION
Complete documentation can be found on github:
.Bd -literal -offset indent
http://juniper.github.io/libxo/libxo-manual.html
.Ed
.Pp
.Nm libxo
lives on github as:
.Bd -literal -offset indent
https://github.com/Juniper/libxo
.Ed
.Pp
The latest release of
.Nm libxo
is available at:
.Bd -literal -offset indent
https://github.com/Juniper/libxo/releases
.Ed
.Sh SEE ALSO
.Xr libxo 3 ,
.Xr xo_emit 3
.Sh HISTORY
The
.Nm libxo
library was added in
.Fx 11.0 .
.Sh AUTHOR
Phil Shafer
4 changes: 4 additions & 0 deletions xopo/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@ endif
man_MANS = xopo.1

EXTRA_DIST = xopo.1

install-data-hook:
for file in ${man_MANS}; do \
cat ../libxo/add.man >> ${DESTDIR}${man1dir}/$$file ; done
25 changes: 0 additions & 25 deletions xopo/xopo.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,31 +72,6 @@ Display version information
.Bd -literal
% xopo -f foo.pot -o foo.pot.new
.Ed
.Sh ADDITIONAL DOCUMENTATION
Complete documentation can be found on github:
.Bd -literal -offset indent
http://juniper.github.io/libxo/libxo-manual.html
.Ed
.Pp
.Nm libxo
lives on github as:
.Bd -literal -offset indent
https://github.com/Juniper/libxo
.Ed
.Pp
The latest release of
.Nm libxo
is available at:
.Bd -literal -offset indent
https://github.com/Juniper/libxo/releases
.Ed
.Sh SEE ALSO
.Xr libxo 3 ,
.Xr xo_format 5
.Sh HISTORY
The
.Nm libxo
library was added in
.Fx 11.0 .
.Sh AUTHOR
Phil Shafer

0 comments on commit 88f2b82

Please sign in to comment.