Skip to content

Maintainance cleanup #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jnpkrn wants to merge 16 commits into from
Closed

Maintainance cleanup #20

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4e4a3ec
build: s/CPPFLAGS/CFLAGS/ + use GLIB_LIB
jnpkrn Feb 17, 2016
056b9c9
maint: spec: SPDX license notation only for SUSE
jnpkrn Feb 17, 2016
e40d4a3
maint: spec: drop redundant, unused %check scriptlet
jnpkrn Feb 17, 2016
ebf53e3
maint: spec: get rid of redundant %clean section
jnpkrn Feb 17, 2016
ab5f397
maint: configure: drop useless AC_CHECK_LIB invocations
jnpkrn Feb 17, 2016
ceec5c2
maint: spec: use pkgconfig for glib-2.0
jnpkrn Feb 17, 2016
e030217
maint: configure: nicely formatted help/summary screens
jnpkrn Feb 17, 2016
2c22f54
maint: configure: --enable-resource-monitor no longer relevant
jnpkrn Feb 24, 2016
1319660
maint: build: allow requesting no HTML man + use in spec
jnpkrn Feb 24, 2016
5d2b6b3
Low: avoid using cl_log directly
jnpkrn Feb 17, 2016
1dcd750
Low: "char *" more string funcs friendly than unsigned variant
jnpkrn Feb 23, 2016
b8b9657
Low: attr: assert the string truncation will not occur
jnpkrn Feb 24, 2016
ce1effc
Low: make (a defensive) use of known static buffer sizes
jnpkrn Feb 24, 2016
89d9e06
Low: apparently static function should be marked so
jnpkrn Feb 24, 2016
8149495
Low: const-cast char arrays where suitable
jnpkrn Feb 23, 2016
9c7ccd2
Low: use unsigned int where suitable
jnpkrn Feb 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
maint: build: allow requesting no HTML man + use in spec
  • Loading branch information
@jnpkrn
jnpkrn committed Apr 11, 2016
commit 1319660bb656b65c5886646322935f067d1c18fb
5 changes: 4 additions & 1 deletion booth.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
%bcond_with html_man

%if 0%{?suse_version}
%global booth_docdir %{_defaultdocdir}/%{name}
%else
Expand Down Expand Up @@ -75,7 +77,8 @@ Pacemaker.
./autogen.sh
%configure \
--with-initddir=%{_initrddir} \
--docdir=%{booth_docdir}
--docdir=%{booth_docdir} \
%{!?with_html_man:--without-html_man}

make

Expand Down
5 changes: 5 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ AC_PATH_PROGS(ASCIIDOC, asciidoc)
AC_PATH_PROGS(XML2CONFIG, xml2-config)

AM_CONDITIONAL(BUILD_ASCIIDOC, test x"${ASCIIDOC}" != x"")
AM_CONDITIONAL(BUILD_ASCIIDOC_HTML_MAN,
test "x${ASCIIDOC}" != "x" && test "x$with_html_man" = "xyes")

# libgcrypt or mhash for hmac
libgcrypt_installed="yes"
Expand Down Expand Up @@ -209,6 +211,9 @@ AC_ARG_WITH([build-version],
[ BOOTH_BUILD_VERSION="$withval" ],
[ BOOTH_BUILD_VERSION="${GIT_VER:-$PACKAGE_VERSION}" ])

AC_ARG_WITH([html_man],
[ --without-html_man : Avoid generating man pages in HTML.])

# OS detection
# THIS SECTION MUST DIE!
CP=cp
Expand Down
4 changes: 3 additions & 1 deletion docs/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ doc_DATA = $(generated_docs)
generated_docs =
generated_mans =

if BUILD_ASCIIDOC
if BUILD_ASCIIDOC_HTML_MAN
generated_docs += $(ascii:%.txt=%.html) $(asciiman:%.txt=%.html)
endif
if BUILD_ASCIIDOC
generated_mans += $(asciiman:%.8.txt=%.8)
$(generated_mans): $(asciiman)
man8_MANS = $(generated_mans)
Expand Down