walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[1.5] Fix autotools installation. Thanks to winfried for patch. 

Update issue 149
This commit is contained in:
Mathieu Malaterre 2012-05-29 13:41:54 +00:00
parent 6da56bb11a
commit 8a279881d4
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libopenjpeg-jpwl.pc.in
View File

@ -1,7 +1,7 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@/openjpeg-@MAJOR_NR@.@MINOR_NR@
Name: openjpeg Name: openjpeg
Description: JPEG2000 Wireless (Part 11 - JPWL) library Description: JPEG2000 Wireless (Part 11 - JPWL) library

6
libopenjpeg/Makefile.am
View File

@ -73,10 +73,7 @@ EXTRA_DIST = \
CMakeLists.txt CMakeLists.txt
install-data-hook: install-data-hook:
cd $(DESTDIR)$(includedir) && \ cd $(DESTDIR)$(includedir) && rm -f openjpeg.h
rm -f openjpeg.h && \
$(LN_S) openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h \
openjpeg.h
@rm -rf $(top_builddir)/report.txt @rm -rf $(top_builddir)/report.txt
@echo -e " (LA)\t$(libdir)/libopenjpeg.la" >> $(top_builddir)/report.txt @echo -e " (LA)\t$(libdir)/libopenjpeg.la" >> $(top_builddir)/report.txt
if BUILD_SHARED if BUILD_SHARED
@ -86,7 +83,6 @@ if BUILD_STATIC
@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt @echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
endif endif
@echo -e " (H)\t$(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h" >> $(top_builddir)/report.txt @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: uninstall-hook:
rm -f $(DESTDIR)$(includedir)/openjpeg.h rm -f $(DESTDIR)$(includedir)/openjpeg.h