diff options
author | David Tardon <dtardon@redhat.com> | 2012-04-14 07:11:04 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-04-14 07:22:15 +0200 |
commit | 55823d331e5adc2d97cf3c8670bdb6f54f772ded (patch) | |
tree | cba8d979ed7afde41764cdd7313762bf9076f49a | |
parent | Keep tinderbox happy. (diff) | |
download | core-55823d331e5adc2d97cf3c8670bdb6f54f772ded.tar.gz core-55823d331e5adc2d97cf3c8670bdb6f54f772ded.zip |
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.
-rw-r--r-- | autodoc/source/exes/adc_uni/makefile.mk | 2 | ||||
-rw-r--r-- | codemaker/source/cppumaker/makefile.mk | 2 | ||||
-rw-r--r-- | codemaker/source/javamaker/makefile.mk | 2 | ||||
-rw-r--r-- | registry/tools/makefile.mk | 2 | ||||
-rw-r--r-- | solenv/bin/macosx-change-install-names.pl | 2 | ||||
-rw-r--r-- | unodevtools/source/skeletonmaker/makefile.mk | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk index 0a973540eec1..859bacebc843 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 25e881a8566f..6904c5244b2c 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 314dd0f85a99..ac248e79aa3d 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 6a759b1289b3..43043716346b 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 ad0318ac810a..82380e1a02d6 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 ec0a382134d3..0a6bfdedd23a 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 \ |