Added conditions for installing man pages according to parts that are builded.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 37c8286f0c)
r14.0.x
Slávek Banko 2 years ago committed by Michele Calgaro
parent 7f2b95bd6d
commit f3d12ac00b
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -195,7 +195,11 @@ AC_DEFUN([KDE_CHECK_JAVA],
AC_REQUIRE([KDE_CHECK_JAVA_DIR]) AC_REQUIRE([KDE_CHECK_JAVA_DIR])
if test "$kde_java_bindir" = "no"; then if test "$kde_java_bindir" = "no"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE $1"; DO_NOT_COMPILE="$DO_NOT_COMPILE $1";
BUILD_$1=false
else
BUILD_$1=true
fi fi
AM_CONDITIONAL(BUILD_$1, ${BUILD_$1})
] ]
) )

@ -1,4 +1,21 @@
if BUILD_dcopjava
DCOPJAVA_MAN=dcopidl2java.1
endif
KJSEMBED_MAN=kjscmd.1
if BUILD_korundum
KORUNDUM_MAN=krubyinit.1 rbtdeapi.1 rbtdesh.1
endif
if BUILD_qtjava
QTJAVA_MAN=juic.1
endif
if BUILD_qtruby
QTRUBY_MAN=qtrubyinit.1 rbqtapi.1 rbqtsh.1 rbuic.1
endif
tmpdir = $(mandir)/man1 tmpdir = $(mandir)/man1
tmp_DATA = dcopidl2java.1 juic.1 kjscmd.1 krubyinit.1 qtrubyinit.1 \ tmp_DATA = $(DCOPJAVA_MAN) $(KJSEMBED_MAN) $(KORUNDUM_MAN) $(QTJAVA_MAN) $(QTRUBY_MAN)
rbqtapi.1 rbqtsh.1 rbtdeapi.1 rbtdesh.1 rbuic.1 EXTRA_DIST=$(DCOPJAVA_MAN) $(KJSEMBED_MAN) $(KORUNDUM_MAN) $(QTJAVA_MAN) $(QTRUBY_MAN)
EXTRA_DIST=$(tmp_DATA)

@ -2,6 +2,7 @@ AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
if test -z "RUBY_EXECUTABLE"; then if test -z "RUBY_EXECUTABLE"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE korundum" DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
BUILD_korundum=false
else else
RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"` RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"` RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
@ -87,4 +88,6 @@ else
AC_SUBST(RUBY_INCLUDEDIR) AC_SUBST(RUBY_INCLUDEDIR)
AC_SUBST(RUBY_LIBRUBYARG) AC_SUBST(RUBY_LIBRUBYARG)
AC_SUBST(RUBY_CFLAGS) AC_SUBST(RUBY_CFLAGS)
BUILD_korundum=true
fi fi
AM_CONDITIONAL(BUILD_korundum, $BUILD_korundum)

@ -2,6 +2,7 @@ AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
if test -z "RUBY_EXECUTABLE"; then if test -z "RUBY_EXECUTABLE"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby" DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
BUILD_qtruby=false
else else
RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"` RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"` RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
@ -87,4 +88,6 @@ else
AC_SUBST(RUBY_INCLUDEDIR) AC_SUBST(RUBY_INCLUDEDIR)
AC_SUBST(RUBY_LIBRUBYARG) AC_SUBST(RUBY_LIBRUBYARG)
AC_SUBST(RUBY_CFLAGS) AC_SUBST(RUBY_CFLAGS)
BUILD_qtruby=true
fi fi
AM_CONDITIONAL(BUILD_qtruby, $BUILD_qtruby)

Loading…
Cancel
Save