diff options
| author | Rene Engelhard <rene@debian.org> | 2012-09-27 19:51:33 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2012-09-27 22:45:03 +0200 |
| commit | c0fb5ed758c9ed8c1bb6b8344592c4781f475443 (patch) | |
| tree | 92537d1c439601a5360115c2a31b86f9c289eb3e /odk | |
| parent | 4e6907b5d526241c93767fd25d8c2866c034a8d8 (diff) | |
add --with-system-ucpp
Change-Id: Ic322d1be23033049fa3b5cd60c00479bb6cae3ca
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/pack/copying/makefile.mk | 6 | ||||
| -rw-r--r-- | odk/util/check.pl | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index f9f4d85aacec..8e6cbb461c84 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -50,13 +50,17 @@ IDL_CHAPTER_REFS=idl_chapter_refs.txt EXELIST = \ $(DESTDIRBIN)/cppumaker$(EXEPOSTFIX) \ $(DESTDIRBIN)/regcompare$(EXEPOSTFIX) \ - $(DESTDIRBIN)/ucpp$(EXEPOSTFIX) \ $(DESTDIRBIN)/idlc$(EXEPOSTFIX) \ $(DESTDIRBIN)/javamaker$(EXEPOSTFIX) \ $(DESTDIRBIN)/autodoc$(EXEPOSTFIX) \ $(DESTDIRBIN)/unoapploader$(EXEPOSTFIX) \ $(DESTDIRBIN)/uno-skeletonmaker$(EXEPOSTFIX) +.IF "$(SYSTEM_UCPP)" == "" +EXELIST += \ + $(DESTDIRBIN)/ucpp$(EXEPOSTFIX) +.ENDIF + .IF "$(GUI)"=="WNT" EXELIST += \ $(DESTDIRBIN)/climaker$(EXEPOSTFIX) diff --git a/odk/util/check.pl b/odk/util/check.pl index a685b7f4ae0f..0840713cb617 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -43,9 +43,12 @@ if (-d "$StartDir") { # check binaries print "check binaries: "; if (-d "$StartDir/bin") { - my @binarylist = ( "idlc","ucpp","cppumaker","javamaker", + my @binarylist = ( "idlc","cppumaker","javamaker", "regcompare","autodoc", "unoapploader", "uno-skeletonmaker" ); + if ($ENV{SYSTEM_UCPP} eq "") { + push @binarylist,"ucpp"; + } foreach $i (@binarylist) { |