diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-02-23 15:04:46 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-02-23 15:04:46 -0500 |
| commit | 5003ab57eee903d072fc7fac8cb5c69a34fb9d5c (patch) | |
| tree | bc54ef6e35fa0ef094235c3701121211aa98789b | |
| parent | Fix typo betwen/between (diff) | |
| download | core-5003ab57eee903d072fc7fac8cb5c69a34fb9d5c.tar.gz core-5003ab57eee903d072fc7fac8cb5c69a34fb9d5c.zip | |
fix deb packaging
Change-Id: I9ddbfad9d332cb68b03857947ce502bda4c0db1b
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/scpaction_ooo.scp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index ffecd1056266..29d38a9125e2 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 63a1d04e53dd..a411666019b2 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"; |