diff options
| author | Albert Astals Cid <aacid@kde.org> | 2007-05-26 22:33:21 +0000 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2007-05-26 22:33:21 +0000 |
| commit | e6ff9e0d95e058f6aff3c72d5f4d7d7ccf661999 (patch) | |
| tree | a043e2eb201c19dc64998ba684098e41ad1a5853 | |
| parent | fefefe495a182c1745314186b99441b9e76ba5b4 (diff) | |
* poppler-qt.pc.in:
* poppler-qt4.pc.in:
* qt/Makefile.am:
* qt4/src/Makefile.am: Install qt3 and qt4 headers in separate dirs.
That way be can reuse poppler-page-transition.h and distros don't get
conflicts when making separate qt3 and qt4 packages
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | poppler-qt.pc.in | 2 | ||||
| -rw-r--r-- | poppler-qt4.pc.in | 2 | ||||
| -rw-r--r-- | qt/Makefile.am | 2 | ||||
| -rw-r--r-- | qt4/src/Makefile.am | 2 |
5 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2007-05-27 Albert Astals Cid <aacid@kde.org> + + * poppler-qt.pc.in: + * poppler-qt4.pc.in: + * qt/Makefile.am: + * qt4/src/Makefile.am: Install qt3 and qt4 headers in separate dirs. + That way be can reuse poppler-page-transition.h and distros don't get + conflicts when making separate qt3 and qt4 packages + 2007-05-26 Albert Astals Cid <aacid@kde.org> * qt4/src/poppler-link-extractor.cc: Use correct page box to extract diff --git a/poppler-qt.pc.in b/poppler-qt.pc.in index 0ac7c0a2..eda24804 100644 --- a/poppler-qt.pc.in +++ b/poppler-qt.pc.in @@ -9,4 +9,4 @@ Version: @VERSION@ Requires: poppler = @VERSION@ Libs: -L${libdir} -lpoppler-qt -Cflags: -I${includedir}/poppler +Cflags: -I${includedir}/poppler/qt3 diff --git a/poppler-qt4.pc.in b/poppler-qt4.pc.in index 1832b11c..3f5121a1 100644 --- a/poppler-qt4.pc.in +++ b/poppler-qt4.pc.in @@ -9,4 +9,4 @@ Version: @VERSION@ Requires: poppler = @VERSION@ Libs: -L${libdir} -lpoppler-qt4 -Cflags: -I${includedir}/poppler +Cflags: -I${includedir}/poppler/qt4 diff --git a/qt/Makefile.am b/qt/Makefile.am index f3743f9c..1163950f 100644 --- a/qt/Makefile.am +++ b/qt/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = \ $(FONTCONFIG_CFLAGS) -poppler_includedir = $(includedir)/poppler +poppler_includedir = $(includedir)/poppler/qt3 poppler_include_HEADERS = \ poppler-qt.h \ poppler-page-transition.h \ diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am index 3dd90ee4..ab9d8b95 100644 --- a/qt4/src/Makefile.am +++ b/qt4/src/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = \ $(FONTCONFIG_CFLAGS) \ $(POPPLER_QT4_CFLAGS) -poppler_includedir = $(includedir)/poppler +poppler_includedir = $(includedir)/poppler/qt4 poppler_include_HEADERS = \ poppler-qt4.h \ |