aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog8
-rw-r--r--macros/Makefile.am6
-rwxr-xr-xmacros/gnome-autogen.sh6
-rw-r--r--macros/gnome-common.m42
4 files changed, 19 insertions, 3 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index e780a962d1..4161f8f513 100644
--- 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 2b7b6ebbc8..5dad06ce03 100644
--- 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
index 0000000000..33d98a62f0
--- /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 b72382970b..b6be9eb4f1 100644
--- 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"