Blame kdiff3-0.9.98-install_prefix.patch
|
Rex Dieter |
2a66ec2 |
diff -up kdiff3-0.9.98/src-QT4/kdiff3.pro.install_prefix kdiff3-0.9.98/src-QT4/kdiff3.pro
|
|
Rex Dieter |
2a66ec2 |
--- kdiff3-0.9.98/src-QT4/kdiff3.pro.install_prefix 2014-07-03 06:37:37.000000000 -0500
|
|
Rex Dieter |
2a66ec2 |
+++ kdiff3-0.9.98/src-QT4/kdiff3.pro 2014-09-16 17:53:47.745252576 -0500
|
|
Rex Dieter |
2a66ec2 |
@@ -66,12 +66,12 @@ os2 {
|
|
Rex Dieter |
2a66ec2 |
}
|
|
Rex Dieter |
2a66ec2 |
|
|
Rex Dieter |
2a66ec2 |
unix {
|
|
Rex Dieter |
2a66ec2 |
- documentation.path = /usr/local/share/doc/kdiff3
|
|
Rex Dieter |
2a66ec2 |
+ documentation.path = /usr/share/doc/kdiff3
|
|
Rex Dieter |
2a66ec2 |
documentation.files = ../doc/*
|
|
Rex Dieter |
2a66ec2 |
|
|
Rex Dieter |
2a66ec2 |
- INSTALLS += documentation
|
|
Rex Dieter |
2a66ec2 |
+ #INSTALLS += documentation
|
|
Rex Dieter |
2a66ec2 |
|
|
Rex Dieter |
2a66ec2 |
- target.path = /usr/local/bin
|
|
Rex Dieter |
2a66ec2 |
+ target.path = /usr/bin
|
|
Rex Dieter |
2a66ec2 |
INSTALLS += target
|
|
Rex Dieter |
2a66ec2 |
}
|
|
Rex Dieter |
2a66ec2 |
|
|
Rex Dieter |
2a66ec2 |
diff -up kdiff3-0.9.98/src-QT4/kreplacements/kreplacements.cpp.install_prefix kdiff3-0.9.98/src-QT4/kreplacements/kreplacements.cpp
|
|
Rex Dieter |
2a66ec2 |
--- kdiff3-0.9.98/src-QT4/kreplacements/kreplacements.cpp.install_prefix 2014-07-03 06:37:37.000000000 -0500
|
|
Rex Dieter |
2a66ec2 |
+++ kdiff3-0.9.98/src-QT4/kreplacements/kreplacements.cpp 2014-09-16 17:53:43.910292281 -0500
|
|
Rex Dieter |
2a66ec2 |
@@ -111,7 +111,7 @@ static void showHelp()
|
|
Rex Dieter |
2a66ec2 |
pBrowser = new QTextBrowser( 0 );
|
|
Rex Dieter |
2a66ec2 |
pBrowser->setMinimumSize( 600, 400 );
|
|
Rex Dieter |
2a66ec2 |
}
|
|
Rex Dieter |
2a66ec2 |
- pBrowser->setSource(QUrl("file://usr/local/share/doc/kdiff3/en/index.html"));
|
|
Rex Dieter |
2a66ec2 |
+ pBrowser->setSource(QUrl("file://usr/share/doc/kdiff3/en/index.html"));
|
|
Rex Dieter |
2a66ec2 |
pBrowser->show();
|
|
Rex Dieter |
2a66ec2 |
#endif
|
|
Rex Dieter |
2a66ec2 |
}
|