configure.ac | 1 +
scp2/source/ooo/scpaction_ooo.scp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5003ab57eee903d072fc7fac8cb5c69a34fb9d5c
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Feb 23 15:04:46 2013 -0500
fix deb packaging
Change-Id: I9ddbfad9d332cb68b03857947ce502bda4c0db1b
diff --git a/configure.ac b/configure.ac
index ffecd10..29d38a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6936,6 +6936,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 63a1d04..a411666 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -53,7 +53,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 = "userscripts/install";
Name = "install";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
