[Libreoffice-commits] .: sdext/source

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Nov 4 16:41:13 PDT 2010


 sdext/source/presenter/makefile.mk |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit f9b99a0e4325ced913150ecc2383001a4c8f9ead
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Nov 5 00:39:43 2010 +0100

    Fix a funny build issue in sdext when not building presenter console.

diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 8e48155..abba4d8 100755
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -42,14 +42,14 @@ MAXLINELENGTH:=80000
 
 PACKAGE=com.sun.PresenterScreen-$(PLATFORMID)
 
-.IF "$(L10N_framework)"==""
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
 .IF "$(ENABLE_PRESENTER_SCREEN)" == "NO"
 @all:
     @echo "Presenter Screen build disabled."
 .ELSE
 
+.IF "$(L10N_framework)"==""
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 DLLPRE=
 common_build_zip=
 
@@ -379,10 +379,9 @@ $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
     $(TYPE) $(DESCRIPTION_TMP) | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
     @@-$(RM) $(DESCRIPTION_TMP)
 
-
-.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
 .ELSE
 ivo:
     $(ECHO)
 .ENDIF # L10N_framework
 
+.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"


More information about the Libreoffice-commits mailing list