diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | bin/ChangeLog | 5 | ||||
-rw-r--r-- | bin/Makefile.am | 2 | ||||
-rwxr-xr-x | bin/gnome-autogen.sh (renamed from macros/gnome-autogen.sh) | 0 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | macros/ChangeLog | 4 | ||||
-rw-r--r-- | macros/Makefile.am | 4 |
7 files changed, 16 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index f49c1cab..7484fd7d 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 00000000..8673130c --- /dev/null +++ b/bin/ChangeLog @@ -0,0 +1,5 @@ +2000-05-29 Martin Baulig <baulig@suse.de> + + * 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 00000000..266aa9d0 --- /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 index c667827a..c667827a 100755 --- a/macros/gnome-autogen.sh +++ b/bin/gnome-autogen.sh diff --git a/configure.in b/configure.in index 793a4878..009adab9 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 ea249237..82beac0c 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,5 +1,9 @@ 2000-05-29 Martin Baulig <baulig@suse.de> + * gnome-autogen.sh: Moved to the `bin/' directory. + +2000-05-29 Martin Baulig <baulig@suse.de> + * 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 5dad06ce..0821f1b6 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 |