From c3bea2d94c2e44ced0f7f3c10eb99b9d7561ea24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 8 Jun 2011 12:24:33 +0000
Subject: [PATCH] installation of programs fixed; closes #70

---
 swisssurfer/src/main.cxx    |  4 +++-
 swisssurfer/src/makefile.am | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/swisssurfer/src/main.cxx b/swisssurfer/src/main.cxx
index 7dda1b7..24e8afb 100644
--- a/swisssurfer/src/main.cxx
+++ b/swisssurfer/src/main.cxx
@@ -15,10 +15,10 @@
 #include <QtCore/QProcess>
 #include <QtCore/QFileInfo>
 #include <QtNetwork/QNetworkProxy>
-
 #include <QtNetwork/QSslConfiguration>
 #include <QtNetwork/QSslCertificate>
 #include <QtNetwork/QSslKey>
+#include <QtWebKit/QWebSettings>
 
 #include <browser.hxx>
 #include <iostream>
@@ -292,6 +292,8 @@ int main(int argv, char** argc) try {
 #endif
 #endif
     ;
+  QWebSettings::globalSettings()->setAttribute
+    (QWebSettings::PluginsEnabled, true);
   bool silent(false);
   bool login(false);
   Settings::MimeTypes mimetypes;
diff --git a/swisssurfer/src/makefile.am b/swisssurfer/src/makefile.am
index 88b95b9..e307a23 100644
--- a/swisssurfer/src/makefile.am
+++ b/swisssurfer/src/makefile.am
@@ -63,6 +63,17 @@ ${QMAKE_TARGET}: ${QMAKE_MAKEFILE} ${ALL_SRC} $(LANGS:%=@PACKAGENAME@_%.qm)
 clean-local:
 	-rm -r ${QMAKE_TARGET}.app
 
+maintainer-clean-local: 
+	-rm -rf ${QMAKE_TARGET}.app 
+
+install-exec-local:
+	( test -f @PACKAGENAME@ && cp @PACKAGENAME@ ${bindir}/ ) \
+	  || ( test -f @PACKAGENAME@.exe && cp @PACKAGENAME@.exe ${bindir}/ ) \
+	  || ( test -d @PACKAGENAME@.app && cp -r @PACKAGENAME@.app ${bindir}/ )
+
+uninstall-local:
+	-rm -rf ${bindir}/@PACKAGENAME@{,.exe,.app} 
+
 CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} $(LANGS:%=@PACKAGENAME@_%.qm) \
              *.o *.obj qrc_*.cpp ui_*.h moc_*.cpp \
 	     ${QMAKE_TARGET} \