1. The jp3d/libjp3dvm/Makefile.am has been changed:

Installing: /usr/local/TEST_CONFIG/include/openjpeg3d-1.3/
Installing: /usr/local/TEST_CONFIG/include/openjpeg3d-1.3/openjpeg3d.h

PREFIX/include:

   23  openjpeg.h -> openjpeg-1.4/openjpeg.h
   27  openjpeg3d.h -> openjpeg3d-1.3/openjpeg3d.h

28773  openjpeg-1.4/openjpeg.h
22158  openjpeg3d-1.3/openjpeg3d.h

2. The jp3d/Makefile.nix has been changed respectivly.

3. The mj2/Makefile.nix contained a wrong path to 'compat/'

4. opj_config.h.in.user contained a comment within a comment.

5. 'autoreconf' reported that AC_PROG_RANLIB is no longer necessary in 'configure.ac'.

diff --git a/Makefile.nix b/Makefile.nix
index 69caaddf45455ca1a79338bc6609f9bf86151c76..b65ed2edd4a7a8b5d80b248985b95b0ea14f0cce 100644 (file)
--- a/Makefile.nix
+++ b/Makefile.nix
@@ -85,10 +85,11 @@ ifeq ($(ENABLE_SHARED),yes)
 endif
        ldconfig
        install -d $(DESTDIR)$(INSTALL_INCLUDE)
+       rm -f $(DESTDIR)$(INSTALL_INCLUDE)/openjpeg.h
        install -m 644 -o root -g root libjp3dvm/openjpeg.h \
-       $(DESTDIR)$(INSTALL_INCLUDE)
+       $(DESTDIR)$(INSTALL_INCLUDE)/openjpeg3d.h
        (cd $(DESTDIR)$(prefix)/include && \
-       ln -sf $(headerdir)/openjpeg.h openjpeg3d.h)
+       ln -sf $(headerdir)/openjpeg3d.h openjpeg3d.h)
        make -C codec -f Makefile.nix install
 
 uninstall:

diff --git a/libjp3dvm/Makefile.am b/libjp3dvm/Makefile.am
index 9f8fce363879429708b01d425cdfc32696f47254..c048599f819d8d34a44800c9076ba4378be7e83c 100644 (file)
--- a/libjp3dvm/Makefile.am
+++ b/libjp3dvm/Makefile.am
@@ -46,7 +46,7 @@ all-local:
        @rm -f .report_lib/libopenjp3dvm.lai
        @echo "" > ../.report.txt
        @echo "Installing: ${prefix}/include/${headerdir}/" >> ../.report.txt
-       @echo "Installing: ${prefix}/include/${headerdir}/openjpeg.h" >> ../.report.txt
+       @echo "Installing: ${prefix}/include/${headerdir}/openjpeg3d.h" >> ../.report.txt
        @(cd .report_lib; \
        l=`ls --file-type`; \
        for f in $$l ; do \
@@ -56,8 +56,9 @@ all-local:
 
 install-data-hook:
        (cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h)
+       (cd ${prefix}/include/${headerdir} && mv openjpeg.h openjpeg3d.h) 
        (cd $(DESTDIR)${prefix}/include && \
-       $(LN_S) ${headerdir}/openjpeg.h openjpeg3d.h)
+       $(LN_S) ${headerdir}/openjpeg3d.h openjpeg3d.h)
 
 uninstall-hook:
        (cd $(DESTDIR)${prefix}/include && rm -rf openjpeg3d.h ${headerdir})