diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-01 12:19:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-02 22:07:53 +0100 |
| commit | bc5069ac40a19fc0f421403c9f8ae7e645b34cbb (patch) | |
| tree | 630f91fad103ece03f8d9e15f6e074dbe8c70a09 /redland | |
| parent | 64a882888665dcbe15acc5793e7c9cf5f1bdc575 (diff) | |
remove SOLARENV variable
It is constant and can just be replaced by $(SRCDIR)/solenv.
Use BUILD_TYPE where it was used to check if config_*.mk is sourced.
Change-Id: Ib9d480c57194b6340093aa47776f8768df69b7d1
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/ExternalProject_rasqal.mk | 2 | ||||
| -rw-r--r-- | redland/ExternalProject_redland.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk index 00c6ad4a9344..6b695de2ead3 100644 --- a/redland/ExternalProject_rasqal.mk +++ b/redland/ExternalProject_rasqal.mk @@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \ && $(MAKE) \ $(if $(filter MACOSX,$(OS)),&& $(PERL) \ - $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ + $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ $(gb_Package_SOURCEDIR_rasqal)/src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib) \ ) endif diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index 2e3e9dd8d080..9b96c9cfbfa6 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,redland,build): $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ && $(MAKE) \ $(if $(filter MACOSX,$(OS)),&& $(PERL) \ - $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ + $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ $(gb_Package_SOURCEDIR_redland)/src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib) \ ) endif |