gEDA-cvs: branch: master updated (rel_0.1.1.90-19-gd118b25)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  d118b25782b51e0e3c490c466ad87f3de0ba9951 (commit)
      from  0e745ded110615a4dbaf96039fd4dc9c0ab503fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 configure.ac     |   14 +++++++++++++-
 data/Makefile.am |    5 +++--
 2 files changed, 16 insertions(+), 3 deletions(-)


=================
 Commit Messages
=================

commit d118b25782b51e0e3c490c466ad87f3de0ba9951
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Thu Jan 10 02:39:39 2008 +0000

    Added --with-xdgdatadir configure option
    
    This options sets where icons and menu entries are installed. It defaults
    to ${datadir}, but may be over-ridden to $HOME/.local/share/ for a "this
    user only" install.

:100644 100644 afcc449... f46b3db... M	configure.ac
:100644 100644 c61037d... c729c48... M	data/Makefile.am

=========
 Changes
=========

commit d118b25782b51e0e3c490c466ad87f3de0ba9951
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Thu Jan 10 02:39:39 2008 +0000

    Added --with-xdgdatadir configure option
    
    This options sets where icons and menu entries are installed. It defaults
    to ${datadir}, but may be over-ridden to $HOME/.local/share/ for a "this
    user only" install.

diff --git a/configure.ac b/configure.ac
index afcc449..f46b3db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,7 @@ AC_DEFUN([AC_PYTHON_MODULE],[
 #
 
 AC_ARG_ENABLE(update-desktop-database,
-   AC_HELP_STRING([--disable-update-dektop-database],
+   AC_HELP_STRING([--disable-update-desktop-database],
                    [do not update desktop file database after installation]),,
                    enable_update_desktop_database=yes)
 
@@ -93,6 +93,18 @@ AC_ARG_WITH(templatesdir, [  --with-templatesdir=path       Change where the tem
 
 AC_SUBST(templatesdir)
 
+# Change default location for XDG files (.desktop and icons)
+AC_ARG_WITH(xdgdatadir, [  --with-xdgdatadir=path  Change where the .desktop file and theme icons are installed [[DATADIR]]], [opt_xdgdatadir=$withval])
+
+if test x$opt_xdgdatadir = x; then
+        # path was not specified with --with-xdgdatadir
+        XDGDATADIR='${datadir}'
+else
+        # path WAS specified with --with-xdgdatadir
+        XDGDATADIR="$opt_xdgdatadir"
+fi
+AC_SUBST(XDGDATADIR)
+
 #
 # Command line flags end
 ##########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index c61037d..c729c48 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,6 @@
 theme=hicolor
-themedir=$(datadir)/icons/$(theme)
+xdgdatadir=@XDGDATADIR@
+themedir=$(xdgdatadir)/icons/$(theme)
 
 app_icon = geda-xgsch2pcb
 
@@ -15,7 +16,7 @@ theme_icons = \
 	$(app_icon_files:%=apps,%)
 
 
-desktopdir=$(datadir)/applications
+desktopdir=$(xdgdatadir)/applications
 desktop_in_files = geda-xgsch2pcb.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs