[Libreoffice-commits] core.git: odk/settings

Stephan Bergmann sbergman at redhat.com
Tue Dec 2 06:44:42 PST 2014


 odk/settings/settings.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 428bd61cd80b49c0e4ec1b2ee4b4b8870ebf9a35
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 2 15:44:07 2014 +0100

    Consistently use $(...)
    
    Change-Id: I68d3f99ca2a53988fb40ce0d5d364e19a8781cc0

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index b8548e3..2169af4 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -235,7 +235,7 @@ LIBRARY_LINK_FLAGS+=-m64
 EXE_LINK_FLAGS+=-m64
 endif
 
-URE_MISC=${OFFICE_PROGRAM_PATH}
+URE_MISC=$(OFFICE_PROGRAM_PATH)
 
 endif
 
@@ -347,7 +347,7 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,-
 LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
 LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
 
-URE_MISC=${OFFICE_PROGRAM_PATH}
+URE_MISC=$(OFFICE_PROGRAM_PATH)
 
 endif
 
@@ -555,6 +555,6 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined
 LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS)
 LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
 
-URE_MISC=${OFFICE_PROGRAM_PATH}
+URE_MISC=$(OFFICE_PROGRAM_PATH)
 
 endif


More information about the Libreoffice-commits mailing list