Fix package-config file's library directory for 64bit architecture.

Change-Id: If8c4f3e65d5b8567982af573843fdc7f3e7862a9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c1b233..9670c96 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,13 +16,26 @@ SET(GLES2_VERSION "${GLES2_VERSION_MAJOR}.${GLES2_VERSION_MINOR}")
 SET(BUILD_ARCH "$ENV{RPM_ARCH}")
 
 IF(${BUILD_ARCH} MATCHES "aarch64")
+SET(LIB "lib64")
 SET(LIBDIR "/usr/lib64")
 ELSEIF(${BUILD_ARCH} MATCHES "x86_64")
+SET(LIB "lib64")
 SET(LIBDIR "/usr/lib64")
 ELSE(${BUILD_ARCH} MATCHES "aarch64")
+SET(LIB "lib")
 SET(LIBDIR "/usr/lib")
 ENDIF(${BUILD_ARCH} MATCHES "aarch64")
 
+#################################################################
+# Build Package Config File
+# ------------------------------
+CONFIGURE_FILE(pkgconfig/egl.pc.in pkgconfig/egl.pc @ONLY)
+CONFIGURE_FILE(pkgconfig/gles11.pc.in pkgconfig/gles11.pc @ONLY)
+CONFIGURE_FILE(pkgconfig/gles20.pc.in pkgconfig/gles20.pc @ONLY)
+CONFIGURE_FILE(pkgconfig/glesv1_cm.pc.in pkgconfig/glesv1_cm.pc @ONLY)
+CONFIGURE_FILE(pkgconfig/glesv1.pc.in pkgconfig/glesv1.pc @ONLY)
+CONFIGURE_FILE(pkgconfig/glesv2.pc.in pkgconfig/glesv2.pc @ONLY)
+
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include_KHR)
 
 ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")

diff --git a/pkgconfig/egl.pc b/pkgconfig/egl.pc.in
similarity index 72%
rename from pkgconfig/egl.pc
rename to pkgconfig/egl.pc.in
index cb03cd6..d1c6369 100644 (file)
--- a/pkgconfig/egl.pc
+++ b/pkgconfig/egl.pc.in
@@ -1,7 +1,7 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
+libdir=${exec_prefix}/@LIB@
+includedir=${prefix}/include
 
 Name: egl
 Description: CoreGL EGL library

diff --git a/pkgconfig/gles11.pc b/pkgconfig/gles11.pc.in
similarity index 88%
rename from pkgconfig/gles11.pc
rename to pkgconfig/gles11.pc.in
index 1ddec10..842e471 100644 (file)
--- a/pkgconfig/gles11.pc
+++ b/pkgconfig/gles11.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir={exec_prefix}/@LIB@
 includedir=${prefix}/include
 
 Name: gles11

diff --git a/pkgconfig/gles20.pc b/pkgconfig/gles20.pc.in
similarity index 87%
rename from pkgconfig/gles20.pc
rename to pkgconfig/gles20.pc.in
index d1d7c14..4bd595b 100644 (file)
--- a/pkgconfig/gles20.pc
+++ b/pkgconfig/gles20.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@LIB@
 includedir=${prefix}/include
 
 Name: gles20

diff --git a/pkgconfig/glesv1.pc b/pkgconfig/glesv1.pc.in
similarity index 87%
rename from pkgconfig/glesv1.pc
rename to pkgconfig/glesv1.pc.in
index e09cefd..2be4671 100644 (file)
--- a/pkgconfig/glesv1.pc
+++ b/pkgconfig/glesv1.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@LIB@
 includedir=${prefix}/include
 
 Name: glesv1

diff --git a/pkgconfig/glesv1_cm.pc b/pkgconfig/glesv1_cm.pc.in
similarity index 87%
rename from pkgconfig/glesv1_cm.pc
rename to pkgconfig/glesv1_cm.pc.in
index 54d77f2..0beafaf 100644 (file)
--- a/pkgconfig/glesv1_cm.pc
+++ b/pkgconfig/glesv1_cm.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@LIB@
 includedir=${prefix}/include
 
 Name: glesv1_cm

diff --git a/pkgconfig/glesv2.pc b/pkgconfig/glesv2.pc.in
similarity index 87%
rename from pkgconfig/glesv2.pc
rename to pkgconfig/glesv2.pc.in
index 7e3cbaa..8273d13 100644 (file)
--- a/pkgconfig/glesv2.pc
+++ b/pkgconfig/glesv2.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@LIB@
 includedir=${prefix}/include
 
 Name: glesv2