From 6b0350781714073b9e1a4471cabba8269e5b06a2 Mon Sep 17 00:00:00 2001
From: Benedikt Meurer <benny@xfce.org>
Date: Thu, 27 Jan 2005 15:49:47 +0000
Subject: [PATCH] 2005-01-27 Benedikt Meurer <benny@xfce.org>
* configure.ac: Fix tag name. Fix order of autoconf macros. Use
autoconf values to initialize automake.
* Makefile.am: Fix distclean-local target. Strip down EXTRA_DIST
list.
(Old svn revision: 2269)
---
ChangeLog | 7 +++++++
Makefile.am | 10 +---------
configure.ac | 12 +++++-------
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 24c853c..9104018 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-27 Benedikt Meurer <benny@xfce.org>
+
+ * configure.ac: Fix tag name. Fix order of autoconf macros. Use
+ autoconf values to initialize automake.
+ * Makefile.am: Fix distclean-local target. Strip down EXTRA_DIST
+ list.
+
2005-01-27 Benedikt Meurer <benny@xfce.org>
* scripts/xdt-autogen.in: Added commands to clean all autogenerated
diff --git a/Makefile.am b/Makefile.am
index 6a4141f..ec17fe0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS = \
scripts
distclean-local:
- rm -rf *.spec *.cache *~ TerminalHelp
+ rm -rf *.spec *.cache *~
dist-bz2: dist
zcat $(PACKAGE)-$(VERSION).tar.gz | \
@@ -26,13 +26,5 @@ rpm: dist
@rm -f $(PACKAGE)-$(VERSION).tar.gz
EXTRA_DIST = \
- AUTHORS \
- COPYING \
- ChangeLog \
HACKING \
- INSTALL \
- NEWS \
- README \
- xfce4-dev-tools.spec.in \
xfce4-dev-tools.spec
-
diff --git a/configure.ac b/configure.ac
index c2fc3d0..ec0d1de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ dnl Version information
m4_define([xdt_version_major], [4])
m4_define([xdt_version_minor], [3])
m4_define([xdt_version_micro], [0])
-m4_define([xdt_version_tag], [svn])
+m4_define([xdt_version_tag], [cvs])
m4_define([xdt_version], [xdt_version_major().xdt_version_minor().xdt_version_micro()xdt_version_tag()])
@@ -19,18 +19,16 @@ dnl # YOU ARE DOING.
dnl Initialize autoconf
+AC_INIT([xfce4-dev-tools], [xdt_version()], [xfce4-dev@xfce.org])
AC_COPYRIGHT([Copyright (c) 2002-2005
The Xfce development team. All rights reserved.
Written for Xfce by Benedikt Meurer <benny@xfce.org>.])
-AC_INIT([xfce4-dev-tools], [xdt_version()], [xfce4-dev@xfce.org])
-AC_PREREQ([2.50])
AC_REVISION([$Id$])
-dnl Initialize automake
-XDT_VERSION=xdt_version()
-AM_INIT_AUTOMAKE([xfce4-dev-tools], [$XDT_VERSION])
-AM_MAINTAINER_MODE
+dnl Initialize the other autotools
+AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
+AM_MAINTAINER_MODE()
dnl Check for basic programs
AC_PROG_INSTALL
--
GitLab