callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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=3258
This commit is contained in:
Martin Baulig
2000-05-29 14:30:32 +00:00
committed by Martin Baulig
parent a3a1843acf
commit f44628eb84
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
macros/ChangeLog
View File

@ -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

6
macros/Makefile.am
View File

@ -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

6
macros/gnome-autogen.sh Executable file
View File

@ -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

2
macros/gnome-common.m4
View File

@ -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"