diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 17:47:03 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 17:47:03 +0000 |
commit | 90a55f8f53379135ed60b1a69dc0748c7b77d85c (patch) | |
tree | c3c49edde4104cf5a07c057bef4005018df77446 /odk/util | |
parent | e3d3a45865374e5011949390b8cc5b7f5a4ad1a2 (diff) |
CWS-TOOLING: integrate CWS configuretoplevel
2009-01-19 15:47:39 +0100 rene r266508 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@266428 (milestone: DEV300:m39)
2009-01-18 00:35:31 +0100 rene r266462 : #i10000# Mac OS X "of course" has other paths...
2009-01-16 13:24:23 +0100 rene r266415 : make OS2 use STLport...
2009-01-15 22:08:38 +0100 rene r266393 : STLport for FreeBSD
2009-01-15 01:23:51 +0100 rene r266333 : #i98048# harmonize STL default; default to *NOT* use STLport
2009-01-09 22:44:43 +0100 rene r266120 : #i97428# try to find out XLIB via pkg-config
2009-01-09 22:41:18 +0100 rene r266119 : #i97827# fail when we don't find make
2008-12-27 01:19:34 +0100 rene r265812 : add make (dis)clean; force /bin/sh as we source *Enc.Set.sh
2008-12-27 01:16:31 +0100 rene r265811 : fix makefile.rc for config.*/config_office move
2008-12-26 22:37:54 +0100 rene r265810 : #i91641# in some cases, we also need the -Xbootclasspath at the second javac call
2008-12-26 17:55:11 +0100 rene r265806 : actually commit Makefile.in
2008-12-25 19:24:24 +0100 rene r265803 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@265758 (milestone: DEV300:m38)
2008-12-10 22:51:06 +0100 rene r265232 : #i96912# revert, cws swffixes02 has the right fix
2008-12-08 18:47:10 +0100 rene r265014 : xulrunner has no /plugin or /nspr
2008-12-08 17:51:28 +0100 rene r265013 : i96912# fix --with-system-mozilla
2008-12-05 13:05:55 +0100 rene r264903 : #i95339#
2008-12-04 17:53:53 +0100 rene r264865 : fix merge error
#i80238# add help for --with-epm
2008-12-04 17:44:28 +0100 rene r264864 : #i91641# fix build with JDKs already including a version of rhino which conflicts with our ancient one
2008-12-04 17:40:48 +0100 rene r264863 : i93429# check for sanity for expand.exe
2008-12-04 17:34:20 +0100 rene r264862 : config_office changes from m33 to m37
2008-12-04 17:28:55 +0100 rene r264861 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@264807 (milestone: DEV300:m37)
2008-12-04 16:49:03 +0100 rene r264856 : fix cws. part 5
2008-12-04 16:45:06 +0100 rene r264855 : fix cws, part 4
2008-12-04 16:01:49 +0100 rene r264850 : fix cws, part 3
2008-12-04 15:14:12 +0100 rene r264848 : fix cws, part 2
Diffstat (limited to 'odk/util')
-rw-r--r-- | odk/util/odk_rules.pmk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk index e416c6711c88..9f987e7ae448 100644 --- a/odk/util/odk_rules.pmk +++ b/odk/util/odk_rules.pmk @@ -64,16 +64,16 @@ $(DESTDIR)$/configure.pl : $(PRJ)$/configure.pl -chmod 755 $@ .ENDIF -$(DESTDIR)$/config.guess : $(SOLARENV)$/bin$/config.guess +$(DESTDIR)$/config.guess : $(SRC_ROOT)$/config.guess @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SOLARENV)$/bin$/config.guess $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.guess $(MY_TEXTCOPY_TARGETPRE) $@ .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -chmod 755 $@ .ENDIF -$(DESTDIR)$/config.sub : $(SOLARENV)$/bin$/config.sub +$(DESTDIR)$/config.sub : $(SRC_ROOT)$/config.sub @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SOLARENV)$/bin$/config.sub $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.sub $(MY_TEXTCOPY_TARGETPRE) $@ .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -chmod 755 $@ .ENDIF |