[QsLog] Now it should work.

Susi Lehtola jussilehtola at fedoraproject.org
Thu Jan 2 22:22:07 UTC 2014


commit a34f22d4a66addafe71a159a3c55164565971511
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date:   Fri Jan 3 00:22:05 2014 +0200

    Now it should work.

 QsLog-libdir.patch |    6 +++---
 QsLog.spec         |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/QsLog-libdir.patch b/QsLog-libdir.patch
index c3e8fd3..add4ccd 100644
--- a/QsLog-libdir.patch
+++ b/QsLog-libdir.patch
@@ -1,6 +1,6 @@
 diff -up QsLog/QsLogSharedLibrary.pro.libdir QsLog/QsLogSharedLibrary.pro
---- QsLog/QsLogSharedLibrary.pro.libdir	2014-01-02 23:44:26.235771741 +0200
-+++ QsLog/QsLogSharedLibrary.pro	2014-01-02 23:44:56.935946360 +0200
+--- QsLog/QsLogSharedLibrary.pro.libdir	2014-01-03 00:21:06.931837093 +0200
++++ QsLog/QsLogSharedLibrary.pro	2014-01-03 00:21:51.041653578 +0200
 @@ -24,11 +24,7 @@ unix:!macx {
      other_files.files = *.txt
      other_files.path = /usr/local/share/$(QMAKE_TARGET)
@@ -10,7 +10,7 @@ diff -up QsLog/QsLogSharedLibrary.pro.libdir QsLog/QsLogSharedLibrary.pro
 -    } else {
 -        target.path = /usr/lib
 -    }
-+    target.path = $(QT_INSTALL_LIBS)
++    target.path = $$[QT_INSTALL_LIBS]
  
      INSTALLS += headers target
  }
diff --git a/QsLog.spec b/QsLog.spec
index 19239f7..c64da61 100644
--- a/QsLog.spec
+++ b/QsLog.spec
@@ -57,7 +57,7 @@ done
 make %{?_smp_mflags}
 
 %install
-make INSTALL_ROOT=%{buildroot} install
+make install INSTALL_ROOT=%{buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig


More information about the scm-commits mailing list