[maemo-commits] [maemo-commits] r15357 - in projects/haf/trunk/osso-af-settings: . debian
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Tue Apr 8 13:23:46 EEST 2008
- Previous message: [maemo-commits] r15356 - projects/haf/tags/gail
- Next message: [maemo-commits] r15358 - projects/haf/tags/osso-af-settings
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: schulhof
Date: 2008-04-08 13:23:44 +0300 (Tue, 08 Apr 2008)
New Revision: 15357
Modified:
projects/haf/trunk/osso-af-settings/Makefile.in
projects/haf/trunk/osso-af-settings/aclocal.m4
projects/haf/trunk/osso-af-settings/configure
projects/haf/trunk/osso-af-settings/configure.ac
projects/haf/trunk/osso-af-settings/debian/changelog
projects/haf/trunk/osso-af-settings/osso-af-settings.pc.in
Log:
* Add AM_MAINTAINER_MODE to configure.ac
* Define datarootdir=@datarootdir@ at the top of osso-af-settings.pc.in,
because autoconf2.61 uses ${datarootdir} in the substitution for @datadir@ et. al.
* Fixes: MB#2483, MB#2484
Modified: projects/haf/trunk/osso-af-settings/Makefile.in
===================================================================
--- projects/haf/trunk/osso-af-settings/Makefile.in 2008-04-08 09:12:22 UTC (rev 15356)
+++ projects/haf/trunk/osso-af-settings/Makefile.in 2008-04-08 10:23:44 UTC (rev 15357)
@@ -75,6 +75,9 @@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@ -159,18 +162,18 @@
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): configure.ac
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
@@ -183,7 +186,7 @@
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOHEADER)
touch $(srcdir)/config.h.in
Modified: projects/haf/trunk/osso-af-settings/aclocal.m4
===================================================================
--- projects/haf/trunk/osso-af-settings/aclocal.m4 2008-04-08 09:12:22 UTC (rev 15356)
+++ projects/haf/trunk/osso-af-settings/aclocal.m4 2008-04-08 10:23:44 UTC (rev 15357)
@@ -833,6 +833,45 @@
Usually this means the macro was only invoked conditionally.])
fi])])
+# Add --enable-maintainer-mode option to configure.
+# From Jim Meyering
+
+# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
+ AC_ARG_ENABLE(maintainer-mode,
+[ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer],
+ USE_MAINTAINER_MODE=$enableval,
+ USE_MAINTAINER_MODE=no)
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+ MAINT=$MAINTAINER_MODE_TRUE
+ AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
Modified: projects/haf/trunk/osso-af-settings/configure
===================================================================
--- projects/haf/trunk/osso-af-settings/configure 2008-04-08 09:12:22 UTC (rev 15356)
+++ projects/haf/trunk/osso-af-settings/configure 2008-04-08 10:23:44 UTC (rev 15357)
@@ -463,7 +463,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP RANLIB ac_ct_RANLIB EGREP LN_S ECHO AR ac_ct_AR CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL desktopentrydir hildondesktopentrydir localedir hildonpixmapdir LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP RANLIB ac_ct_RANLIB EGREP LN_S ECHO AR ac_ct_AR CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL desktopentrydir hildondesktopentrydir localedir hildonpixmapdir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1023,6 +1023,8 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer
--disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors
--enable-shared[=PKGS]
@@ -1895,6 +1897,30 @@
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+ enableval="$enable_maintainer_mode"
+ USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
+fi;
+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+else
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
+
+
ac_config_headers="$ac_config_headers config.h"
@@ -3989,7 +4015,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3992 "configure"' > conftest.$ac_ext
+ echo '#line 4018 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5319,7 +5345,7 @@
# Provide some information about the compiler.
-echo "$as_me:5322:" \
+echo "$as_me:5348:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6415,11 +6441,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6418: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6444: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6422: \$? = $ac_status" >&5
+ echo "$as_me:6448: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6677,11 +6703,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6680: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6706: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6684: \$? = $ac_status" >&5
+ echo "$as_me:6710: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6739,11 +6765,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6742: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6768: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6746: \$? = $ac_status" >&5
+ echo "$as_me:6772: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8978,7 +9004,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8981 "configure"
+#line 9007 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9076,7 +9102,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9079 "configure"
+#line 9105 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11329,11 +11355,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11332: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11358: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11336: \$? = $ac_status" >&5
+ echo "$as_me:11362: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11391,11 +11417,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11394: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11420: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11398: \$? = $ac_status" >&5
+ echo "$as_me:11424: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12761,7 +12787,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12764 "configure"
+#line 12790 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12859,7 +12885,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12862 "configure"
+#line 12888 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13744,11 +13770,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13747: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13773: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13751: \$? = $ac_status" >&5
+ echo "$as_me:13777: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13806,11 +13832,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13809: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13835: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13813: \$? = $ac_status" >&5
+ echo "$as_me:13839: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15934,11 +15960,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15937: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15963: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15941: \$? = $ac_status" >&5
+ echo "$as_me:15967: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16196,11 +16222,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16199: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16225: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16203: \$? = $ac_status" >&5
+ echo "$as_me:16229: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16258,11 +16284,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16261: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16287: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16265: \$? = $ac_status" >&5
+ echo "$as_me:16291: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18497,7 +18523,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18500 "configure"
+#line 18526 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18595,7 +18621,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18598 "configure"
+#line 18624 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19915,6 +19941,13 @@
LTLIBOBJS=$ac_ltlibobjs
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -20488,6 +20521,9 @@
s, at AWK@,$AWK,;t t
s, at SET_MAKE@,$SET_MAKE,;t t
s, at am__leading_dot@,$am__leading_dot,;t t
+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+s, at MAINT@,$MAINT,;t t
s, at build@,$build,;t t
s, at build_cpu@,$build_cpu,;t t
s, at build_vendor@,$build_vendor,;t t
Modified: projects/haf/trunk/osso-af-settings/configure.ac
===================================================================
--- projects/haf/trunk/osso-af-settings/configure.ac 2008-04-08 09:12:22 UTC (rev 15356)
+++ projects/haf/trunk/osso-af-settings/configure.ac 2008-04-08 10:23:44 UTC (rev 15357)
@@ -1,5 +1,6 @@
AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-settings, 0.9.2)
+AM_INIT_AUTOMAKE(osso-af-settings, 0.9.3)
+AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST
Modified: projects/haf/trunk/osso-af-settings/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-settings/debian/changelog 2008-04-08 09:12:22 UTC (rev 15356)
+++ projects/haf/trunk/osso-af-settings/debian/changelog 2008-04-08 10:23:44 UTC (rev 15357)
@@ -1,3 +1,12 @@
+osso-af-settings (0.9.3-1) unstable; urgency=low
+
+ * Add AM_MAINTAINER_MODE to configure.ac
+ * Define datarootdir=@datarootdir@ at the top of osso-af-settings.pc.in,
+ because autoconf2.61 uses ${datarootdir} in the substitution for @datadir@ et. al.
+ * Fixes: MB#2483, MB#2484
+
+ -- Gabriel Schulhof <lucas.rocha at nokia.com> Tue, 8 Apr 2008 13:18:49 +0300
+
osso-af-settings (0.9.2-1) unstable; urgency=low
* Revert back the applications directory to /usr/share/applications/hildon
Modified: projects/haf/trunk/osso-af-settings/osso-af-settings.pc.in
===================================================================
--- projects/haf/trunk/osso-af-settings/osso-af-settings.pc.in 2008-04-08 09:12:22 UTC (rev 15356)
+++ projects/haf/trunk/osso-af-settings/osso-af-settings.pc.in 2008-04-08 10:23:44 UTC (rev 15357)
@@ -1,5 +1,6 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
desktopentrydir=@datadir@/applications/hildon
tasknavigatordesktopentrydir=@datadir@/applications/hildon-navigator
statusbardesktopentrydir=@datadir@/applications/hildon-status-bar
- Previous message: [maemo-commits] r15356 - projects/haf/tags/gail
- Next message: [maemo-commits] r15358 - projects/haf/tags/osso-af-settings
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]