[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.1.2.20070818-172-g7688514)
The branch, master has been updated
via 76885149df80234cd91c42ca83752cfe5cd470f8 (commit)
from bb7b1b374dc7ef8709d1796346e5f55afe634cb8 (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
=========
gattrib/configure.ac | 15 +++++++++++++++
gattrib/data/Makefile.am | 5 +++--
gschem/configure.ac.in | 15 +++++++++++++++
gschem/data/Makefile.am | 5 +++--
4 files changed, 36 insertions(+), 4 deletions(-)
=================
Commit Messages
=================
commit 76885149df80234cd91c42ca83752cfe5cd470f8
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Dec 23 06:11:31 2007 +0000
Add --with-xdgdir=... option to gschem and gattrib to match libgeda
:100644 100644 373a5b2... 0440a07... M gattrib/configure.ac
:100644 100644 5a9d6bf... 7675623... M gattrib/data/Makefile.am
:100644 100644 cfbea38... 83864c3... M gschem/configure.ac.in
:100644 100644 5fe7a0d... 5378d97... M gschem/data/Makefile.am
=========
Changes
=========
commit 76885149df80234cd91c42ca83752cfe5cd470f8
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Dec 23 06:11:31 2007 +0000
Add --with-xdgdir=... option to gschem and gattrib to match libgeda
diff --git a/gattrib/configure.ac b/gattrib/configure.ac
index 373a5b2..0440a07 100644
--- a/gattrib/configure.ac
+++ b/gattrib/configure.ac
@@ -25,6 +25,9 @@ AC_ARG_ENABLE(debug,
# Change default location for rc files
AC_ARG_WITH(rcdir, [ --with-rcdir=path Change where the system-*rc files are installed], [opt_rcdir=$withval])
+# Change default location for XDG files (.desktop and icons)
+AC_ARG_WITH(xdgdir, [ --with-xdgdir=path Change where the .desktop file and theme icons are installed [[DATAROOTDIR]]], [opt_xdgdir=$withval])
+
#
# Command line flags end
#########################################################################
@@ -385,6 +388,16 @@ else
GEDARCDIR="$opt_rcdir"
fi
+if test x$opt_xdgdir = x; then
+ # path was not specified with --with-xdgdir
+ XDGDIR='${datarootdir}'
+else
+ # path WAS specified with --with-xdgdir
+ #AC_DEFINE_UNQUOTED(XDGDIR, "$opt_xdgdir", [gEDA/gaf's rc directory])
+ XDGDIR="$opt_xdgdir"
+fi
+AC_SUBST(XDGDIR)
+
# Expand the prefix variable
# I don't like the way this is done, but it works (I hope).
if eval "test x$prefix = xNONE"; then
@@ -435,6 +448,7 @@ AC_OUTPUT
expandedGEDADATADIR=`eval "echo $GEDADATADIR"`
expandedGEDARCDIR=`eval "echo $GEDARCDIR"`
+expandedXDGDIR=`eval "echo $XDGDIR"`
AC_MSG_RESULT([
***** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION *****
@@ -442,6 +456,7 @@ AC_MSG_RESULT([
== libgeda library version: $LIBGEDA_VERSION
== data directory: $expandedGEDADATADIR
== rc directory: $expandedGEDARCDIR
+== xdg directory: $expandedXDGDIR
== compiler flags: $GATTRIB_CFLAGS
== linker flags: $GATTRIB_LDFLAGS
== glib compiler flags: $GLIB_CFLAGS
diff --git a/gattrib/data/Makefile.am b/gattrib/data/Makefile.am
index 5a9d6bf..7675623 100644
--- a/gattrib/data/Makefile.am
+++ b/gattrib/data/Makefile.am
@@ -1,5 +1,6 @@
theme=hicolor
-themedir=$(datadir)/icons/$(theme)
+xdgdir=@XDGDIR@
+themedir=$(xdgdir)/icons/$(theme)
app_icon = gattrib
@@ -15,7 +16,7 @@ theme_icons = \
$(app_icon_files:%=apps,%)
-desktopdir=$(datadir)/applications
+desktopdir=$(xdgdir)/applications
desktop_in_files = geda-gattrib.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index cfbea38..83864c3 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -27,6 +27,9 @@ AC_ARG_ENABLE(stroke,
# Change default location for rc files
AC_ARG_WITH(rcdir, [ --with-rcdir=path Change where the system-*rc files are installed], [opt_rcdir=$withval])
+# Change default location for XDG files (.desktop and icons)
+AC_ARG_WITH(xdgdir, [ --with-xdgdir=path Change where the .desktop file and theme icons are installed [[DATAROOTDIR]]], [opt_xdgdir=$withval])
+
# Allow the user to specify where there libstroke library lives
AC_ARG_WITH(stroke, [ --with-stroke=DIR Tell configure where to find libstroke], [opt_stroke=$withval])
@@ -506,6 +509,16 @@ else
GEDARCDIR="$opt_rcdir"
fi
+if test x$opt_xdgdir = x; then
+ # path was not specified with --with-xdgdir
+ XDGDIR='${datarootdir}'
+else
+ # path WAS specified with --with-xdgdir
+ #AC_DEFINE_UNQUOTED(XDGDIR, "$opt_xdgdir", [gEDA/gaf's rc directory])
+ XDGDIR="$opt_xdgdir"
+fi
+AC_SUBST(XDGDIR)
+
# Expand the prefix variable
# I don't like the way this is done, but it works (I hope).
if eval "test x$prefix = xNONE"; then
@@ -583,6 +596,7 @@ AC_OUTPUT
expandedGEDADATADIR=`eval "echo $GEDADATADIR"`
expandedGEDARCDIR=`eval "echo $GEDARCDIR"`
+expandedXDGDIR=`eval "echo $XDGDIR"`
expandedGEDADOCDIR=`eval "echo $GEDADOCDIR"`
AC_MSG_RESULT([
@@ -595,6 +609,7 @@ AC_MSG_RESULT([
mingw build: $MINGW
data directory: $expandedGEDADATADIR
rc directory: $expandedGEDARCDIR
+ xdg directory: $expandedXDGDIR
documentation directory: $expandedGEDADOCDIR
dmalloc debugging: $with_dmalloc
ElectricFence debugging: $with_efence
diff --git a/gschem/data/Makefile.am b/gschem/data/Makefile.am
index 5fe7a0d..5378d97 100644
--- a/gschem/data/Makefile.am
+++ b/gschem/data/Makefile.am
@@ -1,5 +1,6 @@
theme=hicolor
-themedir=$(datadir)/icons/$(theme)
+xdgdir=@XDGDIR@
+themedir=$(xdgdir)/icons/$(theme)
app_icon = gschem
@@ -15,7 +16,7 @@ theme_icons = \
$(app_icon_files:%=apps,%)
-desktopdir=$(datadir)/applications
+desktopdir=$(xdgdir)/applications
desktop_in_files = geda-gschem.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