From 8a279881d493dd7e803a6c06df74d18907100804 Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Tue, 29 May 2012 13:41:54 +0000
Subject: [PATCH] [1.5] Fix autotools installation. Thanks to winfried for
 patch. Update issue 149

---
 libopenjpeg-jpwl.pc.in  | 2 +-
 libopenjpeg/Makefile.am | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/libopenjpeg-jpwl.pc.in b/libopenjpeg-jpwl.pc.in
index ae73add4..d14acef4 100644
--- a/libopenjpeg-jpwl.pc.in
+++ b/libopenjpeg-jpwl.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/openjpeg-@MAJOR_NR@.@MINOR_NR@
 
 Name: openjpeg
 Description: JPEG2000 Wireless (Part 11 - JPWL) library
diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index 939d4099..9ceaa17d 100644
--- a/libopenjpeg/Makefile.am
+++ b/libopenjpeg/Makefile.am
@@ -73,10 +73,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
@@ -86,7 +83,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