From 806545df34b2e56e8dc9424e8c4496f40e0d57e2 Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Tue, 29 May 2012 13:44:27 +0000
Subject: [PATCH] [trunk] Fix installation issues. Thanks to winfried for
 patch. Fixes issue 149

---
 CMakeLists.txt             | 4 +++-
 libopenjpeg/CMakeLists.txt | 2 +-
 libopenjpeg/Makefile.am    | 8 ++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22dff8fd..af597a94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,7 +218,9 @@ CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_config.h.cmake.in"
  "${OPENJPEG_BINARY_DIR}/opj_config.h"
  @ONLY
  )
-
+#
+INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
+ DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
 #-----------------------------------------------------------------------------
 # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
 OPTION(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
diff --git a/libopenjpeg/CMakeLists.txt b/libopenjpeg/CMakeLists.txt
index c8a66267..cc9a23cd 100644
--- a/libopenjpeg/CMakeLists.txt
+++ b/libopenjpeg/CMakeLists.txt
@@ -55,7 +55,7 @@ INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
 )
 
 # Install includes files
-INSTALL(FILES openjpeg.h
+INSTALL(FILES openjpeg.h opj_stdint.h
   DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
 )
 
diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index 3397c923..2fb79f9f 100644
--- a/libopenjpeg/Makefile.am
+++ b/libopenjpeg/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS += jpwl
 endif
 
 includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)
-includes_HEADERS = openjpeg.h opj_stdint.h
+includes_HEADERS = openjpeg.h opj_stdint.h $(top_builddir)/opj_config.h
 
 lib_LTLIBRARIES = libopenjpeg.la
 
@@ -75,10 +75,7 @@ EXTRA_DIST = \
 CMakeLists.txt
 
 install-data-hook:
-	cd $(DESTDIR)$(includedir) && \
-	  rm -f openjpeg.h && \
-	  $(LN_S) openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h \
-	          openjpeg.h
+	cd $(DESTDIR)$(includedir) && rm -f openjpeg.h
 	@rm -rf $(top_builddir)/report.txt
 	@echo -e " (LA)\t$(libdir)/libopenjpeg.la" >> $(top_builddir)/report.txt
 if BUILD_SHARED
@@ -88,7 +85,6 @@ if BUILD_STATIC
 	@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
 endif
 	@echo -e " (H)\t$(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h" >> $(top_builddir)/report.txt
-	@echo -e " (LN)\t$(includedir)/openjpeg.h" >> $(top_builddir)/report.txt
 
 uninstall-hook:
 	rm -f $(DESTDIR)$(includedir)/openjpeg.h