diff options
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | scp2/InstallScript_setup_osl.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 01682b7f40d8..7581b2d6cc6d 100644 --- a/configure.ac +++ b/configure.ac @@ -11246,10 +11246,10 @@ dnl Test whether to integrate helppacks into the product's installer dnl =================================================================== AC_MSG_CHECKING([for helppack integration]) if test "$with_helppack_integration" = "no"; then - WITH_HELPPACK_INTEGRATION=NO + WITH_HELPPACK_INTEGRATION= AC_MSG_RESULT([no integration]) else - WITH_HELPPACK_INTEGRATION=YES + WITH_HELPPACK_INTEGRATION=TRUE SCPDEFS="$SCPDEFS -DWITH_HELPPACK_INTEGRATION" AC_MSG_RESULT([integration]) fi @@ -11260,11 +11260,11 @@ AC_SUBST(WITH_HELPPACK_INTEGRATION) ############################################################################### AC_MSG_CHECKING([for extensions integration]) if test "x$enable_extension_integration" != "xno"; then - WITH_EXTENSION_INTEGRATION=YES + WITH_EXTENSION_INTEGRATION=TRUE SCPDEFS="$SCPDEFS -DWITH_EXTENSION_INTEGRATION" AC_MSG_RESULT([yes, use integration]) else - WITH_EXTENSION_INTEGRATION=NO + WITH_EXTENSION_INTEGRATION= AC_MSG_RESULT([no, do not integrate]) fi AC_SUBST(WITH_EXTENSION_INTEGRATION) diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index 75f2a8c2b638..fe8a54a65ba1 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -36,7 +36,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ $(if $(filter TRUE,$(ENABLE_CRASHDUMP)),\ scp2/crashrep \ ) \ - $(if $(filter YES,$(WITH_EXTENSION_INTEGRATION)),\ + $(if $(WITH_EXTENSION_INTEGRATION),\ scp2/extensions \ ) \ $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\ |