Merge "DALi Version 2.1.26" into devel/master

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 849f8e0..5367cb3 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -109,11 +109,39 @@ else
   dataReadOnlyDir=${prefix}/share/dali/
 fi
 
+if test x$includedir != x; then
+  INCLUDE_DIR=$includedir
+else
+  INCLUDE_DIR=$prefix/include/
+fi
+if test x$libdir != x; then
+  LIB_DIR=$libdir
+else
+  LIB_DIR=$prefix/lib/
+fi
+if test x$bindir != x; then
+  BIN_DIR=$bindir
+else
+  BIN_DIR=$prefix/bin/
+fi
+
+PREFIX=$prefix
+EXEC_PREFIX=$exec_prefix
+DEV_INCLUDE_PATH=$INCLUDE_DIR
+
 AC_SUBST(dataReadWriteDir)
 AC_SUBST(dataReadOnlyDir)
 AC_SUBST(DALI_CSHARP_BINDER_CFLAGS)
 AC_SUBST(DALI_PROFILE_CFLAGS)
 
+AC_SUBST(INCLUDE_DIR)
+AC_SUBST(LIB_DIR)
+AC_SUBST(BIN_DIR)
+
+AC_SUBST(PREFIX)
+AC_SUBST(EXEC_PREFIX)
+AC_SUBST(DEV_INCLUDE_PATH)
+
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([dali2-csharp-binder.pc])
 
@@ -124,6 +152,10 @@ echo "
 Configuration
 -------------
   Prefix:                           $prefix
+  EXEC_PREFIX:                      $EXEC_PREFIX
+  INCLUDE_DIR:                      $INCLUDE_DIR
+  LIB_DIR:                          $LIB_DIR
+  BIN_DIR:                          $BIN_DIR
   Debug Build:                      $enable_debug
   Compile flags:                    $DALI_CSHARP_BINDER_CFLAGS
   Profile:                          $enable_profile

diff --git a/build/tizen/dali2-csharp-binder.pc.in b/build/tizen/dali2-csharp-binder.pc.in
index 6a0964b..04974ed 100644 (file)
--- a/build/tizen/dali2-csharp-binder.pc.in
+++ b/build/tizen/dali2-csharp-binder.pc.in
@@ -1,13 +1,14 @@
 # Package Information for pkg-config
 
 prefix=@PREFIX@
-exec_prefix=@EXEC_DIR@
+exec_prefix=@EXEC_PREFIX@
+apiversion=@DALI_CSHARP_BINDER_VERSION@
 libdir=@LIB_DIR@
-includedir=@INC_DIR@
+includedir=@DEV_INCLUDE_PATH@
 
 Name: DALi C# binder
 Description: DALi C# binder Libaray
-Version: @VERSION@
+Version: ${apiversion}
 Requires: dali-core dali-adaptor dali-toolkit
 Libs: -L${libdir} -ldali2-csharp-binder
 Cflags: -I${includedir}/dali-csharp-binder