installing fwbuilder.desktop

build_num

@@ -1 +1 @@
-#define BUILD_NUM 440
+#define BUILD_NUM 445

configure.in

@@ -66,6 +66,8 @@ esac
 AC_ARG_WITH(templatedir, [  --with-templatedir=DIR  Specify directory path for fwbuilder template files ])
 AC_ARG_WITH(docdir,      [  --with-docdir=DIR       Specify directory path for fwbuilder 
                           documentation files  ])
+AC_ARG_WITH(datadir,     [  --with-datadir=DIR      Specify directory path for fwbuilder 
+                          data files  ])
 
 
 
@@ -389,26 +391,33 @@ else
 fi
 DOCDIRPATH=`dirname ${DOCDIR}`
 
+if test "x$with_datadir" != "x"; then
+  DATADIR="${with_datadir}"
+else
+  DATADIR="${PREFIX}/share/"
+fi
+
 AC_SUBST(OS)
-AC_DEFINE_UNQUOTED(OS,               "${OS}", [os])
+AC_DEFINE_UNQUOTED(OS, "${OS}", [os])
-test -n "$OS_CYGWIN"  && AC_DEFINE_UNQUOTED(OS_CYGWIN,        "${OS_CYGWIN}", [cygwin])
+test -n "$OS_CYGWIN" && AC_DEFINE_UNQUOTED(OS_CYGWIN, "${OS_CYGWIN}", [cygwin])
-test -n "$OS_MINGW"   && AC_DEFINE_UNQUOTED(OS_MINGW,         "${OS_MINGW}", [mingw])
+test -n "$OS_MINGW" && AC_DEFINE_UNQUOTED(OS_MINGW, "${OS_MINGW}", [mingw])
-test -n "$OS_MACOSX"  && AC_DEFINE_UNQUOTED(OS_MACOSX,        "${OS_MACOSX}", [macosx])
+test -n "$OS_MACOSX" && AC_DEFINE_UNQUOTED(OS_MACOSX, "${OS_MACOSX}", [macosx])
-test -n "$OS_SOLARIS" && AC_DEFINE_UNQUOTED(OS_SOLARIS,       "${OS_SOLARIS}", [solaris])
+test -n "$OS_SOLARIS" && AC_DEFINE_UNQUOTED(OS_SOLARIS,"${OS_SOLARIS}",[solaris])
-test -n "$OS_FREEBSD" && AC_DEFINE_UNQUOTED(OS_FREEBSD,       "${OS_FREEBSD}", [freebsd])
+test -n "$OS_FREEBSD" && AC_DEFINE_UNQUOTED(OS_FREEBSD,"${OS_FREEBSD}",[freebsd])
-test -n "$OS_OPENBSD" && AC_DEFINE_UNQUOTED(OS_OPENBSD,       "${OS_OPENBSD}", [openbsd])
+test -n "$OS_OPENBSD" && AC_DEFINE_UNQUOTED(OS_OPENBSD,"${OS_OPENBSD}",[openbsd])
-test -n "$OS_LINUX"   && AC_DEFINE_UNQUOTED(OS_LINUX,         "${OS_LINUX}", [linux])
+test -n "$OS_LINUX" && AC_DEFINE_UNQUOTED(OS_LINUX, "${OS_LINUX}", [linux])
-test -n "$OS_UNKNOWN" && AC_DEFINE_UNQUOTED(OS_UNKNOWN,       "${OS_UNKNOWN}", [unknown])
+test -n "$OS_UNKNOWN" && AC_DEFINE_UNQUOTED(OS_UNKNOWN,"${OS_UNKNOWN}",[unknown])
 
 AC_SUBST(DISTRO)
-AC_DEFINE_UNQUOTED(DISTRO,           "${DISTRO}", [distro])
+AC_DEFINE_UNQUOTED(DISTRO, "${DISTRO}", [distro])
 
 AC_SUBST(DOCDIRPATH)
-AC_DEFINE_UNQUOTED(DOCDIRPATH,       "${DOCDIRPATH}", [docdirpath])
+AC_DEFINE_UNQUOTED(DOCDIRPATH, "${DOCDIRPATH}", [docdirpath])
 
 AC_SUBST(DOCDIR)
-AC_DEFINE_UNQUOTED(DOCDIR,           "${DOCDIR}", [docdir])
+AC_DEFINE_UNQUOTED(DOCDIR, "${DOCDIR}", [docdir])
 
+AC_SUBST(DATADIR)
 AC_SUBST(MANDIR)
 
 AC_PATH_PROG(CCACHE, ccache, , )

doc/ChangeLog

@@ -1,5 +1,7 @@
 2008-08-03  Vadim Kurland  <vadim@vk.crocodile.org>
 
+	* res.pro: Now installing fwbuilder.desktop file on Linux.
+
 	* bug #2036912 "fwbuilder b442 does not build". Added missing
 	forward declarations and #include for gcc 4.3
 

qmake.inc

@@ -43,19 +43,17 @@ unix {
 	dtd.path                = @TEMPLATE_DIR@/
 	migration.path          = @TEMPLATE_DIR@/migration
 	doc.path                = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
+	datadir.path		    = /home/vadim/src/fwb3-branch-v3/install_root/share/
 
 #	win32:target.path    = $$PREFIX/
 #	unix:target.path     = $$PREFIX/share/fwbuilder/
 #	macx:target.path     = $$PREFIX/
 
-	res.files           = src/res/objects_init.xml src/res/templates.xml src/res/resources.xml
 	res.path			= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0
-	res_os.files        = src/res/os/*.xml
 	res_os.path 		= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/os/
-	res_platform.files  = src/res/platform/*.xml
 	res_platform.path 	= /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/platform/
-	res_help.files      = src/res/help/*.html
 	res_help.path 	    = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/help/
+	res_desktop.path	= /home/vadim/src/fwb3-branch-v3/install_root/share//applications/
 
     INSTALLS		   += res 
     INSTALLS		   += res_os

qmake.inc.in

@@ -43,19 +43,17 @@ unix {
 	dtd.path                = @TEMPLATE_DIR@/
 	migration.path          = @TEMPLATE_DIR@/migration
 	doc.path                = @DOCDIR@
+	datadir.path		    = @DATADIR@
 
 #	win32:target.path    = $$PREFIX/
 #	unix:target.path     = $$PREFIX/share/fwbuilder/
 #	macx:target.path     = $$PREFIX/
 
-	res.files           = src/res/objects_init.xml src/res/templates.xml src/res/resources.xml
 	res.path			= @RES_DIR@
-	res_os.files        = src/res/os/*.xml
 	res_os.path 		= @RES_DIR@/os/
-	res_platform.files  = src/res/platform/*.xml
 	res_platform.path 	= @RES_DIR@/platform/
-	res_help.files      = src/res/help/*.html
 	res_help.path 	    = @RES_DIR@/help/
+	res_desktop.path	= @DATADIR@/applications/
 
     INSTALLS		   += res 
     INSTALLS		   += res_os

src/res/fwbuilder.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Firewall Builder
+Comment=Design and Manage Firewall Rules
+Icon=fwbuilder
+Categories=System;Settings;Security;Qt;
+Exec=fwbuilder
+Type=Application
+StartupNotify=true
+Terminal=false

src/res/res.pro

@@ -35,3 +35,10 @@ INSTALLS += res
 INSTALLS += res_os
 INSTALLS += res_platform
 INSTALLS += res_help
+
+unix {
+!macx {
+	res_desktop.files = fwbuilder.desktop
+	INSTALLS += res_desktop
+}
+}