Revert "[Tizen] Fix vd's aarch64 gbs build issue"

This reverts commit b1f8c61cc474d194a2a828dca509adc76b408d73.

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 2693c1ee992d7d41416aac15b9890feb19d67511..849f8e0599618b30c7ed7346dd922978908963dc 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -113,8 +113,6 @@ AC_SUBST(dataReadWriteDir)
 AC_SUBST(dataReadOnlyDir)
 AC_SUBST(DALI_CSHARP_BINDER_CFLAGS)
 AC_SUBST(DALI_PROFILE_CFLAGS)
-AC_SUBST(LIBDIR)
-AC_SUBST(INCLUDEDIR)
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([dali2-csharp-binder.pc])

diff --git a/build/tizen/dali2-csharp-binder.pc.in b/build/tizen/dali2-csharp-binder.pc.in
index ff3aa78ec2009cf2baa7b2d8b85afbb083e9566b..6a0964b875f36581b3c175b49111756172b5ffa9 100644 (file)
--- a/build/tizen/dali2-csharp-binder.pc.in
+++ b/build/tizen/dali2-csharp-binder.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@PREFIX@
 exec_prefix=@EXEC_DIR@
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
+libdir=@LIB_DIR@
+includedir=@INC_DIR@
 
 Name: DALi C# binder
 Description: DALi C# binder Libaray

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index b0ed9f71b0740ba25ba9cbe02027c338c3245533..8ec3b8854dee8388cb9c9572f9a1edd6b19a3375 100644 (file)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -176,7 +176,7 @@ LDFLAGS+=" -Wl,--rpath=%{_libdir} "
 %if %{with wayland}
 CFLAGS+=" -DWAYLAND"
 CXXFLAGS+=" -DWAYLAND"
-configure_flags="--enable-wayland LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}"
+configure_flags="--enable-wayland"
 
 # Need Ecore-Wayland2 when Tizen version is 5.x or greater
 %if 0%{?tizen_version_major} >= 5