[evolution-patches] gnome-spell automake fixes to behave more automake-y
- From: Jeremy Katz <katzj redhat com>
- To: evolution-patches ximian com
- Subject: [evolution-patches] gnome-spell automake fixes to behave more automake-y
- Date: 07 May 2003 12:59:34 -0400
Attached patch tweaks the gnome-spell automake bits to act more like a
"standard" automake using package so that %makeinstall in RPM spec files
works (expands to make libdir=$RPM_BUILD_ROOT/usr/lib
bindir=$RPM_BUILD_ROOT/usr/bin ... install)
Jeremy
? autom4te.cache
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-spell/ChangeLog,v
retrieving revision 1.42
diff -u -u -r1.42 ChangeLog
--- ChangeLog 14 Apr 2003 18:51:18 -0000 1.42
+++ ChangeLog 7 May 2003 16:56:40 -0000
@@ -1,3 +1,9 @@
+2003-05-07 Jeremy Katz <katzj redhat com>
+
+ * gnome-spell/Makefile.am: Set component location so that it
+ follows normal automake practices
+ * configure.in: No need to set component location here now
+
2003-04-14 Rodney Dawes <dobey ximian com>
* configure.in: Put the component in a privlibdir, Fix AC_DEFINE errors
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-spell/configure.in,v
retrieving revision 1.62
diff -u -u -r1.62 configure.in
--- configure.in 14 Apr 2003 18:51:18 -0000 1.62
+++ configure.in 7 May 2003 16:56:40 -0000
@@ -96,9 +96,6 @@
GNOME_SPELL_DATADIR="${datadir}"
AC_SUBST(GNOME_SPELL_DATADIR)
-GNOME_SPELL_COMPONENT_LOCATION="${libdir}/gnome-spell"
-AC_SUBST(GNOME_SPELL_COMPONENT_LOCATION)
-
dnl
dnl Final part
dnl
Index: gnome-spell/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-spell/gnome-spell/Makefile.am,v
retrieving revision 1.27
diff -u -u -r1.27 Makefile.am
--- gnome-spell/Makefile.am 14 Apr 2003 18:51:18 -0000 1.27
+++ gnome-spell/Makefile.am 7 May 2003 16:56:40 -0000
@@ -36,7 +36,7 @@
Spell-impl.o: Spell.h
-privlibdir = $(GNOME_SPELL_COMPONENT_LOCATION)
+privlibdir = "$(libdir)/gnome-spell"
privlib_LTLIBRARIES = libgnome-spell-component.la
noinst_PROGRAMS = \
@@ -77,7 +77,7 @@
server_DATA = $(server_in_files:.server.in.in=.server)
$(server_in_files:.server.in.in=.server.in): $(server_in_files) Makefile
- sed -e "s|\ GNOME_SPELL_COMPONENT_LOCATION\@|$(GNOME_SPELL_COMPONENT_LOCATION)|g" \
+ sed -e "s|\ GNOME_SPELL_COMPONENT_LOCATION\@|$(privlibdir)|g" \
-e "s|\ API_VERSION\@|$(API_VERSION)|g" \
-e "s|\ GNOME_SPELL_RELEASE\@|$(GNOME_SPELL_RELEASE)|g" $< > $@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]