summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-07-17 12:30:48 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-07-18 09:29:19 +0100
commit63c508e3e86a140e35161c45d2be97779746f6cb (patch)
treecd9cf11ebc10c6a2bef35e0179d8b42b7c2c1e89 /odk
parentd97caa2a77bcd42cb67eba659f7a79baf8ac0cfc (diff)
re-base on ALv2 code. Includes:
118568: switch to using ucpp Patch contributed by Juergen Schmidt http://svn.apache.org/viewvc?view=revision&revision=1209396
Diffstat (limited to 'odk')
-rw-r--r--odk/pack/copying/makefile.mk2
-rw-r--r--odk/util/check.pl2
2 files changed, 2 insertions, 2 deletions
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index 0feafee71f6b..f9f4d85aacec 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -50,7 +50,7 @@ IDL_CHAPTER_REFS=idl_chapter_refs.txt
EXELIST = \
$(DESTDIRBIN)/cppumaker$(EXEPOSTFIX) \
$(DESTDIRBIN)/regcompare$(EXEPOSTFIX) \
- $(DESTDIRBIN)/idlcpp$(EXEPOSTFIX) \
+ $(DESTDIRBIN)/ucpp$(EXEPOSTFIX) \
$(DESTDIRBIN)/idlc$(EXEPOSTFIX) \
$(DESTDIRBIN)/javamaker$(EXEPOSTFIX) \
$(DESTDIRBIN)/autodoc$(EXEPOSTFIX) \
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 7811635067e1..a685b7f4ae0f 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -43,7 +43,7 @@ if (-d "$StartDir") {
# check binaries
print "check binaries: ";
if (-d "$StartDir/bin") {
- my @binarylist = ( "idlc","idlcpp","cppumaker","javamaker",
+ my @binarylist = ( "idlc","ucpp","cppumaker","javamaker",
"regcompare","autodoc",
"unoapploader", "uno-skeletonmaker" );