diff options
| author | Martin Baulig <martin@home-of-linux.org> | 2000-11-21 18:16:48 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 2000-11-21 18:16:48 +0000 |
| commit | 4bef9ecf9296f5ba660ec873dd90af42ca1190bd (patch) | |
| tree | 9066df1f4347c49f4beebe5721f805d2cb5df006 | |
| parent | 1f8d693b87ce9132f3880809f52ede46727ef5e4 (diff) | |
| download | gnome-common-4bef9ecf9296f5ba660ec873dd90af42ca1190bd.tar.gz | |
New file. Autogen gnome-autogen.sh from it; added GNOME_COMMON_DATA_DIR
2000-11-21 Martin Baulig <martin@home-of-linux.org>
* gnome-autogen.sh.in: New file. Autogen gnome-autogen.sh
from it; added GNOME_COMMON_DATA_DIR and make it actually
work.
svn path=/trunk/; revision=1467
| -rw-r--r-- | bin/.cvsignore | 1 | ||||
| -rw-r--r-- | bin/ChangeLog | 4 | ||||
| -rw-r--r-- | bin/Makefile.am | 12 | ||||
| -rwxr-xr-x | bin/gnome-autogen.sh | 19 | ||||
| -rw-r--r-- | bin/gnome-autogen.sh.in | 30 | ||||
| -rw-r--r-- | configure.in | 1 |
6 files changed, 46 insertions, 21 deletions
diff --git a/bin/.cvsignore b/bin/.cvsignore index 3dda729..161a1f6 100644 --- a/bin/.cvsignore +++ b/bin/.cvsignore @@ -1,2 +1,3 @@ Makefile.in Makefile +gnome-autogen.sh diff --git a/bin/ChangeLog b/bin/ChangeLog index 2ce7c3c..9f3fb24 100644 --- a/bin/ChangeLog +++ b/bin/ChangeLog @@ -1,6 +1,8 @@ 2000-11-21 Martin Baulig <martin@home-of-linux.org> - * Makefile.am (EXTRA_DIST): Put gnome-autogen.sh here. + * gnome-autogen.sh.in: New file. Autogen gnome-autogen.sh + from it; added GNOME_COMMON_DATA_DIR and make it actually + work. 2000-11-20 Martin Baulig <baulig@suse.de> diff --git a/bin/Makefile.am b/bin/Makefile.am index 0edaa74..36bff37 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,5 +1,15 @@ bin_SCRIPTS = gnome-autogen.sh -EXTRA_DIST = gnome-autogen.sh +## We create gnome-autogen.sh here and not from configure because we want +## to get the paths expanded correctly. Macros like srcdir are given +## the value NONE in configure if the user doesn't specify them (this +## is an autoconf feature, not a bug). +gnome-autogen.sh: gnome-autogen.sh.in Makefile +## Use sed and then mv to avoid problems if the user interrupts. + sed -e 's#\@datadir\@#$(datadir)#g' \ + < $(srcdir)/gnome-autogen.sh.in > gnome-autogen.tmp \ + && mv gnome-autogen.tmp gnome-autogen.sh + +EXTRA_DIST = gnome-autogen.sh.in diff --git a/bin/gnome-autogen.sh b/bin/gnome-autogen.sh deleted file mode 100755 index dc218fa..0000000 --- a/bin/gnome-autogen.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if test -z "$GNOME_DATADIR" ; then - if test -z "$GNOME_DIR" ; then - GNOME_DATADIR=`gnome-config --datadir` - else - GNOME_DATADIR="$GNOME_DIR/share" - fi -fi - -if test -n "$USE_GNOME2_MACROS" ; then - export GNOME_COMMON_MACROS_DIR="$GNOME_DATADIR/aclocal/gnome2-macros" -else - export GNOME_COMMON_MACROS_DIR="$GNOME_DATADIR/aclocal/gnome-macros" -fi - -export ACLOCAL_FLAGS="-I $GNOME_COMMON_MACROS_DIR $ACLOCAL_FLAGS" -. $GNOME_COMMON_MACROS_DIR/autogen.sh - diff --git a/bin/gnome-autogen.sh.in b/bin/gnome-autogen.sh.in new file mode 100644 index 0000000..cb8b68b --- /dev/null +++ b/bin/gnome-autogen.sh.in @@ -0,0 +1,30 @@ +#!/bin/sh + +if test -z "USE_GNOME2_MACROS" ; then + USE_GNOME2_MACROS=0 +fi + +if test "$USE_GNOME2_MACROS" = 1 ; then + if test -z "$GNOME2_DIR" ; then + GNOME_COMMON_DATADIR="@datadir@" + else + GNOME_COMMON_DATADIR="$GNOME2_DIR/share" + fi + GNOME_COMMON_MACROS_DIR="$GNOME_COMMON_DATADIR/aclocal/gnome2-macros" +else + if test -z "$GNOME_DIR" ; then + GNOME_COMMON_DATADIR="@datadir@" + else + GNOME_COMMON_DATADIR="$GNOME_DIR/share" + fi + GNOME_COMMON_MACROS_DIR="$GNOME_COMMON_DATADIR/aclocal/gnome-macros" +fi + +export GNOME_COMMON_DATADIR +export GNOME_COMMON_MACROS_DIR + +ACLOCAL_FLAGS="-I $GNOME_COMMON_MACROS_DIR $ACLOCAL_FLAGS" +export ACLOCAL_FLAGS + +. $GNOME_COMMON_MACROS_DIR/autogen.sh + diff --git a/configure.in b/configure.in index 34fd6e2..a386349 100644 --- a/configure.in +++ b/configure.in @@ -52,3 +52,4 @@ bin/Makefile doc/Makefile support/Makefile support/gnome-support-2.0.pc]) + |