From c3738f753c42ccd88effee6261c6fcd9adf6cdef Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Mon, 29 May 2000 15:42:50 +0000 Subject: [PATCH] Moved macros/gnome-autogen.sh to bin/gnome-autogen.sh. svn path=/trunk/; revision=1256 --- Makefile.am | 2 +- bin/ChangeLog | 5 +++++ bin/Makefile.am | 2 ++ {macros => bin}/gnome-autogen.sh | 0 configure.in | 4 +++- macros/ChangeLog | 4 ++++ macros/Makefile.am | 4 +--- 7 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 bin/ChangeLog create mode 100644 bin/Makefile.am rename {macros => bin}/gnome-autogen.sh (100%) diff --git a/Makefile.am b/Makefile.am index f49c1ca..7484fd7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = macros macros2 +SUBDIRS = bin macros macros2 doc EXTRA_DIST = gnome-common.spec diff --git a/bin/ChangeLog b/bin/ChangeLog new file mode 100644 index 0000000..8673130 --- /dev/null +++ b/bin/ChangeLog @@ -0,0 +1,5 @@ +2000-05-29 Martin Baulig + + * gnome-autogen.sh: New file. Moved here from + the `macros' directory. + diff --git a/bin/Makefile.am b/bin/Makefile.am new file mode 100644 index 0000000..266aa9d --- /dev/null +++ b/bin/Makefile.am @@ -0,0 +1,2 @@ +bin_SCRIPTS = gnome-autogen.sh + diff --git a/macros/gnome-autogen.sh b/bin/gnome-autogen.sh similarity index 100% rename from macros/gnome-autogen.sh rename to bin/gnome-autogen.sh diff --git a/configure.in b/configure.in index 793a487..009adab 100644 --- a/configure.in +++ b/configure.in @@ -17,4 +17,6 @@ AM_PROG_LIBTOOL AC_OUTPUT([ Makefile macros/Makefile -macros2/Makefile]) +macros2/Makefile +bin/Makefile +doc/Makefile]) diff --git a/macros/ChangeLog b/macros/ChangeLog index ea24923..82beac0 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,5 +1,9 @@ 2000-05-29 Martin Baulig + * gnome-autogen.sh: Moved to the `bin/' directory. + +2000-05-29 Martin Baulig + * gnome-autogen.sh: If `USE_GNOME_2_MACROS' is set, use the GNOME 2.0 macros from the `macros2' directory. diff --git a/macros/Makefile.am b/macros/Makefile.am index 5dad06c..0821f1b 100644 --- a/macros/Makefile.am +++ b/macros/Makefile.am @@ -24,7 +24,7 @@ MACROS= \ linger.m4 \ need-declaration.m4 -EXTRA_DIST=$(MACROS) gnome-common.m4 autogen.sh gnome-autogen.sh +EXTRA_DIST=$(MACROS) gnome-common.m4 autogen.sh MAINTAINERCLEANFILES=macros.dep @MAINT@macros.dep: Makefile.am @@ -38,6 +38,4 @@ gnome-macros.dep: Makefile.am gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 autogen.sh -bin_SCRIPTS = gnome-autogen.sh - endif -- 2.7.4