Skip to content

Maintenance refresh, part 2: spec file #29

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

Merged
dmuhamedagic merged 11 commits into from
Apr 26, 2016
Merged

Maintenance refresh, part 2: spec file #29

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2c7dda9
maint: configure: drop useless AC_CHECK_LIB invocations
jnpkrn Feb 17, 2016
a098543
maint: configure: --enable-resource-monitor no longer relevant
jnpkrn Feb 24, 2016
11ad406
maint: configure: nicely formatted help/summary screens
jnpkrn Feb 17, 2016
df8ffcb
build: s/CPPFLAGS/CFLAGS/ + use GLIB_LIB
jnpkrn Feb 17, 2016
76f5666
build: allow requesting no HTML man + use in spec
jnpkrn Feb 24, 2016
598fe43
build: add proper zlib build-time check + link flag + spec's BR
jnpkrn Apr 21, 2016
df3cf32
maint: configure: drop some more useless definitions
jnpkrn Apr 22, 2016
4246d0e
maint: spec: SPDX license notation only for SUSE
jnpkrn Feb 17, 2016
b216361
maint: spec: drop redundant, unused %check scriptlet
jnpkrn Feb 17, 2016
91f0bd0
maint: spec: get rid of redundant %clean section
jnpkrn Feb 17, 2016
33c5747
maint: spec: use pkgconfig for glib-2.0
jnpkrn Apr 22, 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
build: allow requesting no HTML man + use in spec
  • Loading branch information
@jnpkrn
jnpkrn committed Apr 21, 2016
commit 76f56668d1796fdef15e40a3f265c4cf5128aaa9
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 @@ -67,7 +69,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