Install macros to `$(datadir)/aclocal/gnome-macros' when

2000-05-29  Martin Baulig  <baulig@suse.de>

	* gnome-common.m4, Makefile.am: Install macros to
	`$(datadir)/aclocal/gnome-macros' when INSIDE_GNOME_COMMON.

	* gnome-autogen.sh: New file. When using gnome-common instead
	of the macros/ directory, use this in your autogen.sh.

svn path=/trunk/; revision=1251

diff --git a/macros/ChangeLog b/macros/ChangeLog
index e780a96..4161f8f 100644 (file)
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,11 @@
+2000-05-29  Martin Baulig  <baulig@suse.de>
+
+       * gnome-common.m4, Makefile.am: Install macros to
+       `$(datadir)/aclocal/gnome-macros' when INSIDE_GNOME_COMMON.
+
+       * gnome-autogen.sh: New file. When using gnome-common instead
+       of the macros/ directory, use this in your autogen.sh.
+
 2000-05-15  Russell Steinthal  <rms39@columbia.edu>
 
        * gnome-pilot.m4 (PILOT_LIBS): An attempt to fix the gnome-pilot

diff --git a/macros/Makefile.am b/macros/Makefile.am
index 2b7b6eb..5dad06c 100644 (file)
--- a/macros/Makefile.am
+++ b/macros/Makefile.am
@@ -24,18 +24,20 @@ MACROS=                                             \
   linger.m4                                    \
   need-declaration.m4
 
-EXTRA_DIST=$(MACROS) gnome-common.m4 autogen.sh
+EXTRA_DIST=$(MACROS) gnome-common.m4 autogen.sh gnome-autogen.sh
 MAINTAINERCLEANFILES=macros.dep
 
 @MAINT@macros.dep: Makefile.am
 @MAINT@        @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=macros/%)' > $@
 
 if INSIDE_GNOME_COMMON
-gnome_aclocaldir = $(datadir)/aclocal/gnome
+gnome_aclocaldir = $(datadir)/aclocal/gnome-macros
 
 gnome-macros.dep: Makefile.am
        @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=$(gnome_aclocaldir)/%)' > $@
 
 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
new file mode 100755 (executable)
index 0000000..33d98a6
--- /dev/null
+++ b/macros/gnome-autogen.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+export GNOME_COMMON_MACROS_DIR=`gnome-config --datadir`/aclocal/gnome-macros
+export ACLOCAL_FLAGS="-I $GNOME_COMMON_MACROS_DIR $ACLOCAL_FLAGS"
+. $GNOME_COMMON_MACROS_DIR/autogen.sh
+

diff --git a/macros/gnome-common.m4 b/macros/gnome-common.m4
index b723829..b6be9eb 100644 (file)
--- a/macros/gnome-common.m4
+++ b/macros/gnome-common.m4
@@ -6,7 +6,7 @@ dnl GNOME_COMMON_INIT
 
 AC_DEFUN([GNOME_COMMON_INIT],
 [
-       GNOME_ACLOCAL_DIR=`$ACLOCAL --print-ac-dir`/gnome
+       GNOME_ACLOCAL_DIR=`$ACLOCAL --print-ac-dir`/gnome-macros
        AC_SUBST(GNOME_ACLOCAL_DIR)
 
        ACLOCAL="$ACLOCAL -I $GNOME_ACLOCAL_DIR"