[Xfce4-commits] <xfmpc:master> Update autotools build

Mike Massonnet mmassonnet at xfce.org
Tue Aug 18 12:14:03 CEST 2009


Updating branch refs/heads/master
         to cab4a5cb056cf6465fdd18b4a6f05dd3993c37fd (commit)
       from db720a31e87c0c465144a902e2bd080d69058321 (commit)

commit cab4a5cb056cf6465fdd18b4a6f05dd3993c37fd
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Tue Aug 18 12:11:01 2009 +0200

    Update autotools build
    
    Drop the po/LINGUAS file and substitute them directly inside the
    configure script instead.
    Update the version tag svn=>git and pass the project URL.

 autogen.sh      |   11 +----------
 configure.in.in |    7 ++++---
 po/LINGUAS      |    2 --
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index ec8ebd4..4fc0da9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,17 +18,8 @@ EOF
   exit 1
 }
 
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
-  cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
-            or try to checkout again.
-EOF
-  exit 1
-}
-
 # substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
+linguas=`ls po/*.po 2>/dev/null | awk 'BEGIN {FS="[./]"; ORS=" "} {print $2}'`
 if test -d .git; then
   revision=`git log --pretty=format:%h -n 1`
 else
diff --git a/configure.in.in b/configure.in.in
index 63b8385..9a544d4 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -11,15 +11,16 @@ m4_define([xfmpc_version_major], [0])
 m4_define([xfmpc_version_minor], [2])
 m4_define([xfmpc_version_micro], [0])
 m4_define([xfmpc_version_build], [r at REVISION@])
-m4_define([xfmpc_version_tag], [svn]) # leave empty for release
-m4_define([xfmpc_version], [xfmpc_version_major().xfmpc_version_minor().xfmpc_version_micro()ifelse(xfmpc_version_tag(), [svn], [xfmpc_version_tag()-xfmpc_version_build()], [xfmpc_version_tag()])])
+m4_define([xfmpc_version_tag], [git]) # leave empty for release
+m4_define([xfmpc_version], [xfmpc_version_major().xfmpc_version_minor().xfmpc_version_micro()ifelse(xfmpc_version_tag(), [git], [xfmpc_version_tag()-xfmpc_version_build()], [xfmpc_version_tag()])])
 
 dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
 AC_COPYRIGHT([Copyright (c) 2008
         The Xfce development team. All rights reserved.])
-AC_INIT([Xfmpc], [xfmpc_version], [http://bugzilla.xfce.org/], [xfmpc])
+AC_INIT([Xfmpc], [xfmpc_version], [http://bugzilla.xfce.org/], [xfmpc],
+        [http://goodies.xfce.org/projects/applications/xfmpc])
 AC_PREREQ([2.50])
 AC_CANONICAL_TARGET()
 AC_REVISION([$Id$])
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index a6713eb..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ar ast ca cs da de en_GB es eu fi fr gl id it ja nl pt_BR pt sl sv tr uk ur ur_PK zh_CN



More information about the Xfce4-commits mailing list