autodoc/source/exes/adc_uni/makefile.mk | 2 +-
codemaker/source/cppumaker/makefile.mk | 2 +-
codemaker/source/javamaker/makefile.mk | 2 +-
registry/tools/makefile.mk | 2 +-
solenv/bin/macosx-change-install-names.pl | 2 +-
unodevtools/source/skeletonmaker/makefile.mk | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 55823d331e5adc2d97cf3c8670bdb6f54f772ded
Author: David Tardon <dtar...@redhat.com>
Date: Sat Apr 14 07:11:04 2012 +0200
replace APP?RPATH SDK by SDKBIN in old build system
Commit 0c80ad06fd96a4fec062a7edfff12bb65ef204b4 broke MacOS X builds
because of this discrepancy. It would be easy to accept both, but I
think it is better to be consistent with gbuild.
diff --git a/autodoc/source/exes/adc_uni/makefile.mk
b/autodoc/source/exes/adc_uni/makefile.mk
index 0a97354..859bace 100644
--- a/autodoc/source/exes/adc_uni/makefile.mk
+++ b/autodoc/source/exes/adc_uni/makefile.mk
@@ -72,7 +72,7 @@ APP1TARGET= $(TARGET)
APP1STACK= 1000000
APP1OBJS= $(OBJ)$/main.obj
-APP1RPATH=SDK
+APP1RPATH=SDKBIN
.IF "$(GUI)"=="WNT"
APP1STDLIBS= $(COSVLIB) $(UDMLIB)
diff --git a/codemaker/source/cppumaker/makefile.mk
b/codemaker/source/cppumaker/makefile.mk
index 25e881a..6904c52 100644
--- a/codemaker/source/cppumaker/makefile.mk
+++ b/codemaker/source/cppumaker/makefile.mk
@@ -64,7 +64,7 @@ NOOPTFILES= \
$(OBJ)$/cpputype.obj
APP1TARGET= $(TARGET)
-APP1RPATH=SDK
+APP1RPATH=SDKBIN
APP1OBJS= $(OBJFILES)
APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN) $(OUT)$/lib$/$(COMMONCPPLIBDEPN)
diff --git a/codemaker/source/javamaker/makefile.mk
b/codemaker/source/javamaker/makefile.mk
index 314dd0f..ac248e7 100644
--- a/codemaker/source/javamaker/makefile.mk
+++ b/codemaker/source/javamaker/makefile.mk
@@ -56,7 +56,7 @@ OBJFILES = \
$(OBJ)$/javatype.obj
APP1TARGET= $(TARGET)
-APP1RPATH=SDK
+APP1RPATH=SDKBIN
APP1OBJS = $(OBJFILES)
APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN) $(OUT)$/lib$/$(COMMONJAVALIBDEPN)
diff --git a/registry/tools/makefile.mk b/registry/tools/makefile.mk
index 6a759b1..4304371 100644
--- a/registry/tools/makefile.mk
+++ b/registry/tools/makefile.mk
@@ -62,7 +62,7 @@ APP2STDLIBS=\
APP3TARGET= regcompare
APP3OBJS= $(OBJ)$/regcompare.obj $(OBJ)/fileurl.obj $(OBJ)/options.obj
-APP3RPATH= SDK
+APP3RPATH= SDKBIN
APP3STDLIBS=\
$(SALLIB) \
diff --git a/solenv/bin/macosx-change-install-names.pl
b/solenv/bin/macosx-change-install-names.pl
index ad0318a..82380e1 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -71,7 +71,7 @@ sub action($$$)
return $act;
}
-@ARGV >= 2 or die 'Usage: app|shl UREBIN|URELIB|OOO|SDK|OXT|NONE <filepath>*';
+@ARGV >= 2 or die 'Usage: app|shl UREBIN|URELIB|OOO|SDKBIN|OXT|NONE
<filepath>*';
$type = shift @ARGV;
$loc = shift @ARGV;
if ($type eq "Executable")
diff --git a/unodevtools/source/skeletonmaker/makefile.mk
b/unodevtools/source/skeletonmaker/makefile.mk
index ec0a382..0a6bfde 100644
--- a/unodevtools/source/skeletonmaker/makefile.mk
+++ b/unodevtools/source/skeletonmaker/makefile.mk
@@ -44,7 +44,7 @@ all:
.INCLUDE : $(PRJ)$/unodevtools.pmk
APP1TARGET = $(TARGET)
-APP1RPATH=SDK
+APP1RPATH=SDKBIN
APP1OBJS = $(OBJ)$/skeletonmaker.obj \
$(OBJ)$/skeletoncommon.obj \
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
