summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-11-20 15:37:34 +0100
committerMichael Stahl <mstahl@redhat.com>2013-11-20 15:39:40 +0100
commit776f48eb97a99e077824741ad300fed27e4edd14 (patch)
treecd9502c08a481e376d9a2418a2ce23d9ce814df5 /scp2
parentc24eba06580cbeb1e6a6d0a4d3fe2cfa22abd8a7 (diff)
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
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/scpaction_ooo.scp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index 040963eea581..c84f4a994857 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";