configure.ac | 1 + scp2/source/ooo/scpaction_ooo.scp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit 776f48eb97a99e077824741ad300fed27e4edd14 Author: Michael Stahl <[email protected]> Date: Wed Nov 20 15:37:34 2013 +0100 Revert "fdo#67060 do not package RPM-only install script to DEB packs" Put back the definition of WITH_RPM: otherwise a build --with-pkgformat=archive fails since the scripts/install is not built. Leave in the change to installer that should fix the original DEB bug. This reverts commit 4f995b395ea347469ca9c7681d2f01f63e966d96. Change-Id: I0cf4ba003237c66dfb7a0677d6a32a69f8203c6b diff --git a/configure.ac b/configure.ac index 2c136c0..14fdbfd 100755 --- a/configure.ac +++ b/configure.ac @@ -7347,6 +7347,7 @@ if test "$enable_epm" = "yes"; then elif "$RPM" --help 2>&1 | $EGREP buildroot >/dev/null; then RPM_PATH=`which $RPM` AC_MSG_RESULT([$RPM_PATH]) + SCPDEFS="$SCPDEFS -DWITH_RPM" else AC_MSG_ERROR([cannot build packages. Try installing rpmbuild.]) fi diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index 040963e..c84f4a9 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -44,7 +44,7 @@ ScpAction scp_Copy_Readme_Txt End #endif -#if !defined(WNT) && !defined(MACOSX) +#if !defined(WNT) && !defined(MACOSX) && defined(WITH_RPM) ScpAction scp_Copy_Install Copy = "scripts/install"; Name = "install"; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
