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/15 01:15:59 UTC
svn commit: r1409600 - in /incubator/ooo/branches/gbuild/main:
dbaccess/AllLangResTarget_dbmm.mk scp2/source/base/file_base.scp
Author: arist
Date: Thu Nov 15 00:15:58 2012
New Revision: 1409600
URL: http://svn.apache.org/viewvc?rev=1409600&view=rev
Log:
gnumake4_147_6a688d53e64f.patch
# HG changeset patch
# User Michael Stahl <ms...@openoffice.org>
# Date 1303224776 0
# Node ID 6a688d53e64fddacb5d893b2854e6cc3a5aadc6e
# Parent 53a113ad0eb04beb57b1970edf3e593455671136
gnumake4: dbaccess: rename stuff so it builds again...
Modified:
incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk
incubator/ooo/branches/gbuild/main/scp2/source/base/file_base.scp
Modified: incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk?rev=1409600&r1=1409599&r2=1409600&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk Thu Nov 15 00:15:58 2012
@@ -25,22 +25,22 @@
#
#*************************************************************************
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbamm))
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbmm))
-$(eval $(call gb_AllLangResTarget_set_reslocation,dbamm,dbaccess))
+$(eval $(call gb_AllLangResTarget_set_reslocation,dbmm,dbaccess))
-$(eval $(call gb_AllLangResTarget_add_srs,dbamm,dbaccess/dbamm))
+$(eval $(call gb_AllLangResTarget_add_srs,dbmm,dbaccess/dbmm))
-$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbamm))
+$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbmm))
-$(eval $(call gb_SrsTarget_set_include,dbaccess/dbamm,\
+$(eval $(call gb_SrsTarget_set_include,dbaccess/dbmm,\
$$(INCLUDE) \
-I$(OUTDIR)/inc \
-I$(SRCDIR)/dbaccess/source/ext/macromigration \
-I$(SRCDIR)/dbaccess/inc \
))
-$(eval $(call gb_SrsTarget_add_files,dbaccess/dbamm,\
+$(eval $(call gb_SrsTarget_add_files,dbaccess/dbmm,\
dbaccess/source/ext/macromigration/macromigration.src \
))
Modified: incubator/ooo/branches/gbuild/main/scp2/source/base/file_base.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/scp2/source/base/file_base.scp?rev=1409600&r1=1409599&r2=1409600&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/scp2/source/base/file_base.scp (original)
+++ incubator/ooo/branches/gbuild/main/scp2/source/base/file_base.scp Thu Nov 15 00:15:58 2012
@@ -50,8 +50,8 @@ STD_RES_FILE( gid_File_Res_Abp, abp)
STD_LIB_FILE( gid_File_Lib_Dbp, dbp)
STD_RES_FILE( gid_File_Res_Dbp, dbp)
-STD_LIB_FILE( gid_File_Lib_Dbu, dbu )
-STD_RES_FILE( gid_File_Res_Dbu, dbu)
+STD_LIB_FILE( gid_File_Lib_Dbu, dbui)
+STD_RES_FILE( gid_File_Res_Dbu, dbui)
STD_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
STD_RES_FILE( gid_File_Res_Adabasui, adabasui)