[trunk] Fix installation issues. Thanks to winfried for patch.

Fixes issue 149

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22dff8fd86ab6c363c8af75be0574dbf0ff578a3..af597a949954bb75a453aec11b1a1bcc656b35f0 100644 (file)
--- 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 c8a66267e088670ba45f95300872dba852b445d6..cc9a23cdb91859c2bc1513317bfc83a55ae5e12f 100644 (file)
--- 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 3397c9230c3e78f58de6aeb567bf7250921fdd91..2fb79f9fce07562a5fdb55d82a5e080aabc4c927 100644 (file)
--- 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