Updating branch refs/heads/master
to 89f4dfd00cf1c2a4e63d317b8edc3c671535513d (commit)
from d0422b6aec4aa96682112edeb964815010e97f51 (commit)
commit 89f4dfd00cf1c2a4e63d317b8edc3c671535513d
Author: Harald Judt <h.j...@gmx.at>
Date: Tue Jan 15 14:27:46 2013 +0100
Autotools updates (bug #9763).
Make it work with >=automake-1.13.
configure.ac.in | 4 ++--
panel-plugin/Makefile.am | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index be4e6d6..4096503 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -18,7 +18,7 @@ m4_define([weather_version],
[weather_version_major().weather_version_minor().we
dnl ***************************
dnl *** Initialize autoconf ***
dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2006-2007
+AC_COPYRIGHT([Copyright (c) 2006-2013
The Xfce development team. All rights reserved.])
AC_INIT([xfce4-weather-plugin], [weather_version],
[http://bugzilla.xfce.org/], [xfce4-weather-plugin])
AC_PREREQ([2.60])
@@ -27,7 +27,7 @@ dnl ***************************
dnl *** Initialize automake ***
dnl ***************************
AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE()
dnl ********************************
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index fcd086f..adaaa53 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DTHEMESDIR=\"$(datadir)/xfce4/weather/icons\" \
-DGEONAMES_USERNAME=\"@GEONAMES_USERNAME@\" \
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
