diff options
| author | Martin Baulig <martin@src.gnome.org> | 2000-05-29 15:42:50 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 2000-05-29 15:42:50 +0000 |
| commit | c3738f753c42ccd88effee6261c6fcd9adf6cdef (patch) | |
| tree | b0bbab4b6e6ac2e3d340453e148469e8386cd74e /macros | |
| parent | 36f51b0a71f4f10c74c37d30bcdd59b01f06292b (diff) | |
| download | gnome-common-c3738f753c42ccd88effee6261c6fcd9adf6cdef.tar.gz | |
Moved macros/gnome-autogen.sh to bin/gnome-autogen.sh.
svn path=/trunk/; revision=1256
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/ChangeLog | 4 | ||||
| -rw-r--r-- | macros/Makefile.am | 4 | ||||
| -rwxr-xr-x | macros/gnome-autogen.sh | 11 |
3 files changed, 5 insertions, 14 deletions
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 <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 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 diff --git a/macros/gnome-autogen.sh b/macros/gnome-autogen.sh deleted file mode 100755 index c667827..0000000 --- a/macros/gnome-autogen.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -if test -n "$USE_GNOME_2_MACROS" ; then - export GNOME_COMMON_MACROS_DIR=`gnome-config --datadir`/aclocal/gnome2-macros -else - export GNOME_COMMON_MACROS_DIR=`gnome-config --datadir`/aclocal/gnome-macros -fi - -export ACLOCAL_FLAGS="-I $GNOME_COMMON_MACROS_DIR $ACLOCAL_FLAGS" -. $GNOME_COMMON_MACROS_DIR/autogen.sh - |