Kaydet (Commit) 776f48eb authored tarafından Michael Stahl's avatar Michael Stahl

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 4f995b39.

Change-Id: I0cf4ba003237c66dfb7a0677d6a32a69f8203c6b
üst c24eba06
......@@ -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
......
......@@ -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";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment