[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.3.0-20071229-13-g1697a90)
The branch, master has been updated
via 1697a90e5465dde296199745991e76df8f68c3be (commit)
via c4c409c1cf46a55b74017872d15b6f48d51ce521 (commit)
via ee47fc5fa6d418a54af62a55a78e508d95a0f913 (commit)
from 208cb97b474b29efea9b76d8b9099ffe2bf446af (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
=========
Makefile | 2 +-
gattrib/configure.ac | 19 +++++++++----------
gattrib/data/Makefile.am | 6 +++---
gschem/configure.ac.in | 19 +++++++++----------
gschem/data/Makefile.am | 6 +++---
libgeda/configure.ac.in | 38 +++++++++++++++++++-------------------
libgeda/data/Makefile.am | 10 +++++-----
7 files changed, 49 insertions(+), 51 deletions(-)
=================
Commit Messages
=================
commit 1697a90e5465dde296199745991e76df8f68c3be
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Jan 2 15:41:07 2008 +0000
Changed --with-xdgdir to --with-xdgdatadir for consistency
:100644 100644 7ba35d3... b54c2b6... M Makefile
:100644 100644 92f2827... 5533d76... M gattrib/configure.ac
:100644 100644 7675623... c1b1764... M gattrib/data/Makefile.am
:100644 100644 88846f9... 91b637a... M gschem/configure.ac.in
:100644 100644 5378d97... f21fe08... M gschem/data/Makefile.am
:100644 100644 532f316... 6789c0f... M libgeda/configure.ac.in
:100644 100644 a41da15... 83ca538... M libgeda/data/Makefile.am
commit c4c409c1cf46a55b74017872d15b6f48d51ce521
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Jan 2 15:35:02 2008 +0000
Change --with-kdedir to --with-kdedatadir
This allows greater similarity with the --with-xdgdir paths, by moving the
"/share" portion of the KDE mime install paths out of the Makefile.am and
into the "kdedatadir" expansion.
:100644 100644 69d4ea9... 7ba35d3... M Makefile
:100644 100644 9841dbb... 532f316... M libgeda/configure.ac.in
:100644 100644 4c256af... a41da15... M libgeda/data/Makefile.am
commit ee47fc5fa6d418a54af62a55a78e508d95a0f913
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Jan 2 02:46:14 2008 +0000
Change usage of ${datarootdir} to ${datadir} for autoconf compatibility.
:100644 100644 75f4288... 92f2827... M gattrib/configure.ac
:100644 100644 8e1b106... 88846f9... M gschem/configure.ac.in
:100644 100644 4add99d... 9841dbb... M libgeda/configure.ac.in
=========
Changes
=========
commit 1697a90e5465dde296199745991e76df8f68c3be
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Jan 2 15:41:07 2008 +0000
Changed --with-xdgdir to --with-xdgdatadir for consistency
diff --git a/Makefile b/Makefile
index 7ba35d3..b54c2b6 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ prefix?=$(HOME)/geda
# You can set any global options you want here to be passed to the
# individual ./configure scripts
#
-opts=--with-xdgdir=$(HOME)/.local/share --with-kdedatadir=$(HOME)/.kde/share
+opts=--with-xdgdatadir=$(HOME)/.local/share --with-kdedatadir=$(HOME)/.kde/share
#
# Set this to the shell that you want the various commands to run in.
diff --git a/gattrib/configure.ac b/gattrib/configure.ac
index 92f2827..5533d76 100644
--- a/gattrib/configure.ac
+++ b/gattrib/configure.ac
@@ -26,7 +26,7 @@ AC_ARG_ENABLE(debug,
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 [[DATADIR]]], [opt_xdgdir=$withval])
+AC_ARG_WITH(xdgdatadir, [ --with-xdgdatadir=path Change where the .desktop file and theme icons are installed [[DATADIR]]], [opt_xdgdatadir=$withval])
#
# Command line flags end
@@ -389,15 +389,14 @@ else
GEDARCDIR="$opt_rcdir"
fi
-if test x$opt_xdgdir = x; then
- # path was not specified with --with-xdgdir
- XDGDIR='${datadir}'
+if test x$opt_xdgdatadir = x; then
+ # path was not specified with --with-xdgdatadir
+ XDGDATADIR='${datadir}'
else
- # path WAS specified with --with-xdgdir
- #AC_DEFINE_UNQUOTED(XDGDIR, "$opt_xdgdir", [gEDA/gaf's rc directory])
- XDGDIR="$opt_xdgdir"
+ # path WAS specified with --with-xdgdatadir
+ XDGDATADIR="$opt_xdgdatadir"
fi
-AC_SUBST(XDGDIR)
+AC_SUBST(XDGDATADIR)
# Expand the prefix variable
# I don't like the way this is done, but it works (I hope).
@@ -449,7 +448,7 @@ AC_OUTPUT
expandedGEDADATADIR=`eval "echo $GEDADATADIR"`
expandedGEDARCDIR=`eval "echo $GEDARCDIR"`
-expandedXDGDIR=`eval "echo $XDGDIR"`
+expandedXDGDATADIR=`eval "echo $XDGDATADIR"`
AC_MSG_RESULT([
***** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION *****
@@ -457,7 +456,7 @@ AC_MSG_RESULT([
== libgeda library version: $LIBGEDA_VERSION
== data directory: $expandedGEDADATADIR
== rc directory: $expandedGEDARCDIR
-== xdg directory: $expandedXDGDIR
+== xdg directory: $expandedXDGDATADIR
== 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 7675623..c1b1764 100644
--- a/gattrib/data/Makefile.am
+++ b/gattrib/data/Makefile.am
@@ -1,6 +1,6 @@
theme=hicolor
-xdgdir=@XDGDIR@
-themedir=$(xdgdir)/icons/$(theme)
+xdgdatadir=@XDGDATADIR@
+themedir=$(xdgdatadir)/icons/$(theme)
app_icon = gattrib
@@ -16,7 +16,7 @@ theme_icons = \
$(app_icon_files:%=apps,%)
-desktopdir=$(xdgdir)/applications
+desktopdir=$(xdgdatadir)/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 88846f9..91b637a 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -29,7 +29,7 @@ AC_ARG_ENABLE(stroke,
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 [[DATADIR]]], [opt_xdgdir=$withval])
+AC_ARG_WITH(xdgdatadir, [ --with-xdgdatadir=path Change where the .desktop file and theme icons are installed [[DATADIR]]], [opt_xdgdatadir=$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])
@@ -511,15 +511,14 @@ else
GEDARCDIR="$opt_rcdir"
fi
-if test x$opt_xdgdir = x; then
- # path was not specified with --with-xdgdir
- XDGDIR='${datadir}'
+if test x$opt_xdgdatadir = x; then
+ # path was not specified with --with-xdgdatadir
+ XDGDATADIR='${datadir}'
else
- # path WAS specified with --with-xdgdir
- #AC_DEFINE_UNQUOTED(XDGDIR, "$opt_xdgdir", [gEDA/gaf's rc directory])
- XDGDIR="$opt_xdgdir"
+ # path WAS specified with --with-xdgdatadir
+ XDGDATADIR="$opt_xdgdatadir"
fi
-AC_SUBST(XDGDIR)
+AC_SUBST(XDGDATADIR)
# Expand the prefix variable
# I don't like the way this is done, but it works (I hope).
@@ -598,7 +597,7 @@ AC_OUTPUT
expandedGEDADATADIR=`eval "echo $GEDADATADIR"`
expandedGEDARCDIR=`eval "echo $GEDARCDIR"`
-expandedXDGDIR=`eval "echo $XDGDIR"`
+expandedXDGDATADIR=`eval "echo $XDGDATADIR"`
expandedGEDADOCDIR=`eval "echo $GEDADOCDIR"`
AC_MSG_RESULT([
@@ -611,7 +610,7 @@ AC_MSG_RESULT([
mingw build: $MINGW
data directory: $expandedGEDADATADIR
rc directory: $expandedGEDARCDIR
- xdg directory: $expandedXDGDIR
+ xdg directory: $expandedXDGDATADIR
documentation directory: $expandedGEDADOCDIR
dmalloc debugging: $with_dmalloc
ElectricFence debugging: $with_efence
diff --git a/gschem/data/Makefile.am b/gschem/data/Makefile.am
index 5378d97..f21fe08 100644
--- a/gschem/data/Makefile.am
+++ b/gschem/data/Makefile.am
@@ -1,6 +1,6 @@
theme=hicolor
-xdgdir=@XDGDIR@
-themedir=$(xdgdir)/icons/$(theme)
+xdgdatadir=@XDGDATADIR@
+themedir=$(xdgdatadir)/icons/$(theme)
app_icon = gschem
@@ -16,7 +16,7 @@ theme_icons = \
$(app_icon_files:%=apps,%)
-desktopdir=$(xdgdir)/applications
+desktopdir=$(xdgdatadir)/applications
desktop_in_files = geda-gschem.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index 532f316..6789c0f 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -28,7 +28,7 @@ AM_PROG_LIBTOOL
AC_ARG_WITH(rcdir, [ --with-rcdir=path Change where the system-*rc files are installed], [opt_rcdir=$withval])
# Change default location for XDG files (MIME and Icons)
-AC_ARG_WITH(xdgdir, [ --with-xdgdir=path Change where the theme icons and mime registrations are installed [[DATADIR]]], [opt_xdgdir=$withval])
+AC_ARG_WITH(xdgdatadir, [ --with-xdgdatadir=path Change where the theme icons and mime registrations are installed [[DATADIR]]], [opt_xdgdatadir=$withval])
# Change default location for KDE data files (KDE MIME registrations)
AC_ARG_WITH(kdedatadir, [ --with-kdedatadir=path Change where the KDE mime registrations are installed [[DATADIR]]], [opt_kdedatadir=$withval])
@@ -420,15 +420,14 @@ else
GEDARCDIR="$opt_rcdir"
fi
-if test x$opt_xdgdir = x; then
- # path was not specified with --with-xdgdir
- XDGDIR='${datadir}'
+if test x$opt_xdgdatadir = x; then
+ # path was not specified with --with-xdgdatadir
+ XDGDATADIR='${datadir}'
else
- # path WAS specified with --with-xdgdir
- #AC_DEFINE_UNQUOTED(XDGDIR, "$opt_xdgdir", [gEDA/gaf's rc directory])
- XDGDIR="$opt_xdgdir"
+ # path WAS specified with --with-xdgdatadir
+ XDGDATADIR="$opt_xdgdatadir"
fi
-AC_SUBST(XDGDIR)
+AC_SUBST(XDGDATADIR)
if test x$opt_kdedatadir = x; then
# path was not specified with --with-kdedatadir
@@ -523,7 +522,7 @@ AC_OUTPUT
expandedGEDADATADIR=`eval "echo $GEDADATADIR"`
expandedGEDARCDIR=`eval "echo $GEDARCDIR"`
-expandedXDGDIR=`eval "echo $XDGDIR"`
+expandedXDGDATADIR=`eval "echo $XDGDATADIR"`
expandedKDEDATADIR=`eval "echo $KDEDATADIR"`
AC_MSG_RESULT([
@@ -536,7 +535,7 @@ AC_MSG_RESULT([
mingw build: $MINGW
data directory: $expandedGEDADATADIR
rc directory: $expandedGEDARCDIR
- xdg directory: $expandedXDGDIR
+ xdg data directory: $expandedXDGDATADIR
KDE data directory: $expandedKDEDATADIR
LIBGEDA .so version: $SHARED_LIBRARY_VERSION
dmalloc debugging: $with_dmalloc
diff --git a/libgeda/data/Makefile.am b/libgeda/data/Makefile.am
index a41da15..83ca538 100644
--- a/libgeda/data/Makefile.am
+++ b/libgeda/data/Makefile.am
@@ -1,6 +1,6 @@
theme=hicolor
-xdgdir=@XDGDIR@
-themedir=$(xdgdir)/icons/$(theme)
+xdgdatadir=@XDGDATADIR@
+themedir=$(xdgdatadir)/icons/$(theme)
mime_icons = \
application-x-geda-gsch2pcb-project \
@@ -24,7 +24,7 @@ mime_icon_sources = \
theme_icons = \
$(mime_icon_files:%=mimetypes,%)
-mimedir = $(xdgdir)/mime
+mimedir = $(xdgdatadir)/mime
xmldir = $(mimedir)/packages
xml_in_files = libgeda.xml.in
commit c4c409c1cf46a55b74017872d15b6f48d51ce521
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Jan 2 15:35:02 2008 +0000
Change --with-kdedir to --with-kdedatadir
This allows greater similarity with the --with-xdgdir paths, by moving the
"/share" portion of the KDE mime install paths out of the Makefile.am and
into the "kdedatadir" expansion.
diff --git a/Makefile b/Makefile
index 69d4ea9..7ba35d3 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ prefix?=$(HOME)/geda
# You can set any global options you want here to be passed to the
# individual ./configure scripts
#
-opts=--with-xdgdir=$(HOME)/.local/share --with-kdedir=$(HOME)/.kde/
+opts=--with-xdgdir=$(HOME)/.local/share --with-kdedatadir=$(HOME)/.kde/share
#
# Set this to the shell that you want the various commands to run in.
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index 9841dbb..532f316 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -30,8 +30,8 @@ AC_ARG_WITH(rcdir, [ --with-rcdir=path Change where the system-*rc files
# Change default location for XDG files (MIME and Icons)
AC_ARG_WITH(xdgdir, [ --with-xdgdir=path Change where the theme icons and mime registrations are installed [[DATADIR]]], [opt_xdgdir=$withval])
-# Change default location for KDE files (KDE MIME registrations)
-AC_ARG_WITH(kdedir, [ --with-kdedir=path Change where the KDE mime registrations are installed [[PREFIX]]], [opt_kdedir=$withval])
+# Change default location for KDE data files (KDE MIME registrations)
+AC_ARG_WITH(kdedatadir, [ --with-kdedatadir=path Change where the KDE mime registrations are installed [[DATADIR]]], [opt_kdedatadir=$withval])
#
# Command line flags end
@@ -430,14 +430,14 @@ else
fi
AC_SUBST(XDGDIR)
-if test x$opt_kdedir = x; then
- # path was not specified with --with-kdedir
- KDEDIR='${prefix}'
+if test x$opt_kdedatadir = x; then
+ # path was not specified with --with-kdedatadir
+ KDEDATADIR='${datadir}'
else
- # path WAS specified with --with-kdedir
- KDEDIR="$opt_kdedir"
+ # path WAS specified with --with-kdedatadir
+ KDEDATADIR="$opt_kdedatadir"
fi
-AC_SUBST(KDEDIR)
+AC_SUBST(KDEDATADIR)
# Defs for libary symbol files
#
@@ -524,6 +524,7 @@ AC_OUTPUT
expandedGEDADATADIR=`eval "echo $GEDADATADIR"`
expandedGEDARCDIR=`eval "echo $GEDARCDIR"`
expandedXDGDIR=`eval "echo $XDGDIR"`
+expandedKDEDATADIR=`eval "echo $KDEDATADIR"`
AC_MSG_RESULT([
** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION
@@ -536,7 +537,7 @@ AC_MSG_RESULT([
data directory: $expandedGEDADATADIR
rc directory: $expandedGEDARCDIR
xdg directory: $expandedXDGDIR
- KDE directory: $KDEDIR
+ KDE data directory: $expandedKDEDATADIR
LIBGEDA .so version: $SHARED_LIBRARY_VERSION
dmalloc debugging: $with_dmalloc
ElectricFence debugging: $with_efence
diff --git a/libgeda/data/Makefile.am b/libgeda/data/Makefile.am
index 4c256af..a41da15 100644
--- a/libgeda/data/Makefile.am
+++ b/libgeda/data/Makefile.am
@@ -32,8 +32,8 @@ xml_DATA = $(xml_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
-kdedir=@KDEDIR@
-mimelnkdir = $(kdedir)/share/mimelnk
+kdedatadir=@KDEDATADIR@
+mimelnkdir = $(kdedatadir)/mimelnk
applicationdir = $(mimelnkdir)/application
application_in_files = \
commit ee47fc5fa6d418a54af62a55a78e508d95a0f913
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Jan 2 02:46:14 2008 +0000
Change usage of ${datarootdir} to ${datadir} for autoconf compatibility.
diff --git a/gattrib/configure.ac b/gattrib/configure.ac
index 75f4288..92f2827 100644
--- a/gattrib/configure.ac
+++ b/gattrib/configure.ac
@@ -26,7 +26,7 @@ AC_ARG_ENABLE(debug,
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])
+AC_ARG_WITH(xdgdir, [ --with-xdgdir=path Change where the .desktop file and theme icons are installed [[DATADIR]]], [opt_xdgdir=$withval])
#
# Command line flags end
@@ -391,7 +391,7 @@ fi
if test x$opt_xdgdir = x; then
# path was not specified with --with-xdgdir
- XDGDIR='${datarootdir}'
+ XDGDIR='${datadir}'
else
# path WAS specified with --with-xdgdir
#AC_DEFINE_UNQUOTED(XDGDIR, "$opt_xdgdir", [gEDA/gaf's rc directory])
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index 8e1b106..88846f9 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -29,7 +29,7 @@ AC_ARG_ENABLE(stroke,
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])
+AC_ARG_WITH(xdgdir, [ --with-xdgdir=path Change where the .desktop file and theme icons are installed [[DATADIR]]], [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])
@@ -513,7 +513,7 @@ fi
if test x$opt_xdgdir = x; then
# path was not specified with --with-xdgdir
- XDGDIR='${datarootdir}'
+ XDGDIR='${datadir}'
else
# path WAS specified with --with-xdgdir
#AC_DEFINE_UNQUOTED(XDGDIR, "$opt_xdgdir", [gEDA/gaf's rc directory])
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index 4add99d..9841dbb 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -28,7 +28,7 @@ AM_PROG_LIBTOOL
AC_ARG_WITH(rcdir, [ --with-rcdir=path Change where the system-*rc files are installed], [opt_rcdir=$withval])
# Change default location for XDG files (MIME and Icons)
-AC_ARG_WITH(xdgdir, [ --with-xdgdir=path Change where the theme icons and mime registrations are installed [[DATAROOTDIR]]], [opt_xdgdir=$withval])
+AC_ARG_WITH(xdgdir, [ --with-xdgdir=path Change where the theme icons and mime registrations are installed [[DATADIR]]], [opt_xdgdir=$withval])
# Change default location for KDE files (KDE MIME registrations)
AC_ARG_WITH(kdedir, [ --with-kdedir=path Change where the KDE mime registrations are installed [[PREFIX]]], [opt_kdedir=$withval])
@@ -422,7 +422,7 @@ fi
if test x$opt_xdgdir = x; then
# path was not specified with --with-xdgdir
- XDGDIR='${datarootdir}'
+ XDGDIR='${datadir}'
else
# path WAS specified with --with-xdgdir
#AC_DEFINE_UNQUOTED(XDGDIR, "$opt_xdgdir", [gEDA/gaf's rc directory])
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs