2004-09-21 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Tue, 21 Sep 2004 18:58:02 +0000 (18:58 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Tue, 21 Sep 2004 18:58:02 +0000 (18:58 +0000)
* qt/Makefile.am (pinentry_qt_LDFLAGS): Add $(QT_RPATH).
Requested by Leo Savernik <l.savernik@aon.at>.

ChangeLog
NEWS
qt/Makefile.am

index 0c82a00..8cd44ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-21  Marcus Brinkmann  <marcus@g10code.de>
+
+       * qt/Makefile.am (pinentry_qt_LDFLAGS): Add $(QT_RPATH).
+       Requested by Leo Savernik <l.savernik@aon.at>.
+
 2004-09-02  Marcus Brinkmann  <marcus@g10code.de>
 
        * gtk+-2/padlock-keyhole.xpm: File removed.
diff --git a/NEWS b/NEWS
index 7f84632..744f8a5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ Noteworthy changes in version 0.7.2 (unreleased)
  * Remove bug in configure script that would use installed version of
    Qt even if another path was explicitely specified with QTDIR.
 
+ * Honor the rpath setting for Qt.
+
  * Add GTK+-2 pinentry.
 
  * Install a symbolic link under the name "pinentry" that defaults to
index 6f08087..6771990 100644 (file)
@@ -38,7 +38,7 @@ AM_CXXFLAGS = $(QT_CXXFLAGS)
 pinentry_qt_LDADD = $(QT_LIBS) $(libcurses) ../pinentry/libpinentry.a \
        $(top_builddir)/assuan/libassuan.a \
        $(top_builddir)/secmem/libsecmem.a $(LIBCAP)
-pinentry_qt_LDFLAGS = $(QT_LDFLAGS)
+pinentry_qt_LDFLAGS = $(QT_LDFLAGS) $(QT_RPATH)
 
 pinentry_qt_SOURCES = secqstring.h secqstring.cpp \
        secqinternal_p.h secqinternal.cpp \