diff options
| author | Antonin Descampe <antonin@gmail.com> | 2010-10-10 21:17:18 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2010-10-10 21:17:18 +0000 |
| commit | abac838cf40822f9a18a00379a900b6ef7241e5d (patch) | |
| tree | 88356e2d2b5f66b762305d8ea6b2da1dc493a13d | |
| parent | 3caa4f8f4f086e610aa5ee597f673a2c78f8b848 (diff) | |
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'.
| -rw-r--r-- | Makefile.nix | 5 | ||||
| -rw-r--r-- | libjp3dvm/Makefile.am | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.nix b/Makefile.nix index 69caaddf..b65ed2ed 100644 --- 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 9f8fce36..c048599f 100644 --- 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}) |