diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-12-06 12:31:44 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-26 09:11:40 +0100 |
| commit | 2250429dda5539466e2c3d1e33e555c4d66131e6 (patch) | |
| tree | 55712f35f2e51433b25b4bb3f52267e785076190 /odk/settings/std.mk | |
| parent | 7a123cae332c99b047b3d6392b5df803d1aa2c79 (diff) | |
Related: #i121442# Add sed and cat as dependencies to odk
(cherry picked from commit 0a78e6e85d8e921705b7ea90038f822d47fb58ab)
Conflicts:
odk/cfgWin.js
odk/configure.pl
odk/docs/install.html
odk/setsdkenv_unix.sh.in
odk/setsdkenv_windows.template
odk/settings/std.mk
Change-Id: Ie124ffbb857e796923981e13dc3116c7af341056
Diffstat (limited to 'odk/settings/std.mk')
| -rw-r--r-- | odk/settings/std.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/odk/settings/std.mk b/odk/settings/std.mk index d8c5f51028c4..84c986c48612 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -65,6 +65,8 @@ SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS) SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac" SDK_JAR="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/jar" SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip" +SDK_CAT="$(OO_SDK_CAT_HOME)/cat" +SDK_SED="$(OO_SDK_SED_HOME)/sed" IDLC="$(OO_SDK_HOME)/bin/idlc" CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker" JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker" |