[Libreoffice-commits] .: liblangtag/makefile.mk liblangtag/prj

[Eike Rathke]

 liblangtag/makefile.mk |   34 ++++++++++++++++++++++++++++------
 liblangtag/prj/d.lst   |   10 +++++-----
 2 files changed, 33 insertions(+), 11 deletions(-)

New commits:
commit 78c1ea15df28e93e754c6f62bc7cc06888ba58ef
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Aug 8 15:19:54 2012 +0200

    changed prefix and destdir to acommodate MacOSX using OUT2LIB magic

diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index f6345ee..a723d9b 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -45,11 +45,20 @@ PATCH_FILES+=liblangtag-0.2-msvc-warning.patch
 CONFIGURE_DIR=.
 BUILD_DIR=$(CONFIGURE_DIR)
 
-my_misc='$(SRC_ROOT)$/$(PRJNAME)$/$(MISC)'
-my_prefix='$(my_misc)$/install'
-my_data='$(my_prefix)$/share/liblangtag'
-
-CONFIGURE_FLAGS+= --prefix='$(my_prefix)' --libdir='$(my_prefix)/lib'
+.IF "$(OS)" == "MACOSX"
+my_prefix = @__________________________________________________$(EXTRPATH)
+.ELSE
+my_prefix = install-liblangtag
+.END
+my_misc = $(shell @pwd)$/$(MISC)
+my_install_sub = install
+my_destdir = $(my_misc)$/$(my_install_sub)
+my_install = $(my_destdir)$/$(my_prefix)
+# relative to $(MISC)/build/liblangtag/ for OUT2LIB, OUT2INC
+my_install_relative = ..$/..$/$(my_install_sub)$/$(my_prefix)
+my_data = $(my_install)$/share$/liblangtag
+
+CONFIGURE_FLAGS+= --prefix='/$(my_prefix)' --libdir='/$(my_prefix)/lib'
 
 .IF "$(SYSTEM_LIBXML)"!="YES"
 CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)$/external'
@@ -78,7 +87,7 @@ CONFIGURE_FLAGS+= --disable-glibtest
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) .$/configure
 
 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) && \
-			 $(AUGMENT_LIBRARY_PATH) $(GNUMAKE) install
+			 $(AUGMENT_LIBRARY_PATH) $(GNUMAKE) install DESTDIR=$(my_destdir)
 
 
 .IF "$(GUI)"=="WNT"
@@ -98,6 +107,19 @@ PATCH_FILES+=liblangtag-0.2-msc-configure.patch
 .ENDIF	# "$(GUI)"=="WNT"
 
 
+OUT2INC += $(my_install_relative)$/include$/liblangtag$/*
+
+.IF "$(GUI)"=="WNT" && "$(COM)"!="GCC"
+OUT2LIB += $(my_install_relative)$/lib$/langtag.lib*
+.ELSE
+.IF "$(OS)" == "MACOSX"
+OUT2LIB += $(my_install_relative)$/lib$/liblangtag*.dylib
+.ELSE
+OUT2LIB += $(my_install_relative)$/lib$/liblangtag.so*
+.ENDIF
+.ENDIF
+
+
 # --- Targets ------------------------------------------------------
 
 ALLTAR: $(MISC)/liblangtag_data.zip
diff --git a/liblangtag/prj/d.lst b/liblangtag/prj/d.lst
index a5f5dfe..7a52fff 100644
--- a/liblangtag/prj/d.lst
+++ b/liblangtag/prj/d.lst
@@ -1,10 +1,10 @@
 mkdir: %_DEST%\inc\liblangtag
 
-..\%__SRC%\misc\install\include\liblangtag\*    %_DEST%\inc\liblangtag\
-..\%__SRC%\misc\install\lib\liblangtag.so*      %_DEST%\lib\
-..\%__SRC%\misc\install\lib\liblangtag*.dylib   %_DEST%\lib\
-..\%__SRC%\misc\install\lib\langtag.lib*        %_DEST%\lib\
-..\%__SRC%\misc\liblangtag_data.zip             %_DEST%\pck\
+..\%__SRC%\inc\*                    %_DEST%\inc\liblangtag\
+..\%__SRC%\lib\liblangtag.so*       %_DEST%\lib\
+..\%__SRC%\lib\langtag.lib*         %_DEST%\lib\
+..\%__SRC%\lib\liblangtag*.dylib    %_DEST%\lib\
+..\%__SRC%\misc\liblangtag_data.zip %_DEST%\pck\
 
 symlink: %_DEST%\lib\liblangtag.so.0.1.0    %_DEST%\lib\liblangtag.so.0
 symlink: %_DEST%\lib\liblangtag.so.0.1.0    %_DEST%\lib\liblangtag.so