You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/14 23:39:23 UTC

svn commit: r1409487 - /incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk

Author: arist
Date: Wed Nov 14 22:39:22 2012
New Revision: 1409487

URL: http://svn.apache.org/viewvc?rev=1409487&view=rev
Log:
gnumake4_006_968f17c1e8ba.patch
# HG changeset patch
# User mba
# Date 1298451418 -3600
# Node ID 968f17c1e8bafe7c733f55f1944327f4af1d0839
# Parent b42caf8474428f25f7e44c00d319a18a9e06949b
CWS gnumake4: some improvements for zip+jar, documentation


Modified:
    incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk

Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk?rev=1409487&r1=1409486&r2=1409487&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/TargetLocations.mk Wed Nov 14 22:39:22 2012
@@ -54,7 +54,7 @@ gb_CxxObject_get_target = $(WORKDIR)/Cxx
 gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o
 gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1)
 gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
-gb_Jar_get_target = $(WORKDIR)/Jar/$(1)/$(1).jar
+gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar
 gb_Jar_get_final_target = $(WORKDIR)/Jar/$(1).done
 gb_Jar_get_classsetname = Jar/$(1)
 gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1)
@@ -87,7 +87,7 @@ gb_SrsPartMergeTarget_get_target = $(WOR
 gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
 gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
 gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
-gb_Zip_get_target = $(WORKDIR)/Zip/$(1)/$(1).zip
+gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip
 gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
 
 define gb_Library_get_external_headers_target