fdo#67060 do not package RPM-only install script to DEB packs

This reverts commit 5003ab57.
It did not work, when both RPM and DEB were selected as targets.

Change-Id: I90c74f0d00804b80daeca2c69d1f12e094243a81

configure.ac

@@ -7347,7 +7347,6 @@ 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

scp2/source/ooo/scpaction_ooo.scp

@@ -44,7 +44,7 @@ ScpAction scp_Copy_Readme_Txt
 End
 #endif
 
-#if !defined(WNT) && !defined(MACOSX) && defined(WITH_RPM)
+#if !defined(WNT) && !defined(MACOSX)
 ScpAction scp_Copy_Install
     Copy = "scripts/install";
     Name = "install";

solenv/bin/modules/installer/download.pm

@@ -542,6 +542,12 @@ sub create_tar_gz_file_from_directory
     $installer::globals::downloadfilename = $downloadfilename . $installer::globals::downloadfileextension;
     my $targzname = $downloaddir . $installer::globals::separator . $installer::globals::downloadfilename;
 
+    # fdo#67060 - install script is for RPM only
+    if ( -e "$installdir/install" && !$installer::globals::isrpmbuild )
+    {
+        unlink("$installdir/install");
+    }
+
     my $systemcall = "cd $changedir; $ldpreloadstring tar -cf - $packdir | gzip > $targzname";
 
     my $returnvalue = system($systemcall);