[cogl/cogl-1.12] cogl-gles2: Install headers in cogl/ instead of in cogl2/

[Robert Bragg <rbragg src gnome org>]

commit 04348bda0bbdef741e47fa2e9a0f796ad92db301
Author: Tomeu Vizoso <tomeu vizoso collabora com>
Date:   Thu Aug 16 15:17:18 2012 +0200

    cogl-gles2: Install headers in cogl/ instead of in cogl2/
    
    Reviewed-by: Robert Bragg <robert linux intel com>

 cogl-gles2/Makefile.am |    2 +-
 cogl/Makefile.am       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/cogl-gles2/Makefile.am b/cogl-gles2/Makefile.am
index 3ff6291..9bace20 100644
--- a/cogl-gles2/Makefile.am
+++ b/cogl-gles2/Makefile.am
@@ -19,7 +19,7 @@ libcogl_gles2_la_LDFLAGS = \
 	-export-dynamic \
 	-export-symbols-regex "^gl*"
 
-coglgles2includedir = $(includedir)/cogl2/cogl-gles2/GLES2
+coglgles2includedir = $(includedir)/cogl/cogl-gles2/GLES2
 coglgles2include_HEADERS = \
 	GLES2/gl2.h \
 	GLES2/gl2ext.h \
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 43a8b60..027df65 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -523,7 +523,7 @@ coglincludedir = $(includedir)/cogl/cogl
 coglinclude_HEADERS = $(cogl_headers) $(cogl_experimental_h)
 nodist_coglinclude_HEADERS = $(cogl_nodist_experimental_h) cogl-defines.h cogl-enum-types.h
 
-cogl_proto_includedir = $(includedir)/cogl2/cogl/gl-prototypes
+cogl_proto_includedir = $(includedir)/cogl/cogl/gl-prototypes
 cogl_proto_include_HEADERS = $(cogl_gl_prototypes_h)
 
 dist-hook: ../build/win32/vs9/cogl.vcproj ../build/win32/vs10/cogl.vcxproj ../build/win32/vs10/cogl.vcxproj.filters ../build/win32/gen-enums.bat