[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: 64-gary-set-pkglibexecdir-at-make-time.patch
From: |
Gary V. Vaughan |
Subject: |
FYI: 64-gary-set-pkglibexecdir-at-make-time.patch |
Date: |
Fri, 12 Sep 2003 14:55:05 +0100 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.5b) Gecko/20030903 Thunderbird/0.2 |
Applied to HEAD.
--
())_. Gary V. Vaughan gary@(lilith.warpmail.net|gnu.org)
( '/ Research Scientist http://www.oranda.demon.co.uk ,_())____
/ )= GNU Hacker http://www.gnu.org/software/libtool \' `&
`(_~)_ Tech' Author http://sources.redhat.com/autobook =`---d__/
Index: ChangeLog
from Gary V. Vaughan <address@hidden>
* configure.ac (pkglibexecdir): Don't try and set it here, PACKAGE
isn't set yet.
* m4/Makefile.am (MODULE_PATH): Removed. Calculate pkglibexecdir
inline.
* modules/Makefile.am (pkglibexecdir): Set it here.
(pkgmodincdir): Renamed to pkgmodincludedir). Changed all clients.
Index: configure.ac
===================================================================
RCS file: /cvsroot/m4/m4/configure.ac,v
retrieving revision 1.22
diff -u -p -u -r1.22 configure.ac
--- configure.ac 12 Sep 2003 13:27:54 -0000 1.22
+++ configure.ac 12 Sep 2003 13:47:11 -0000
@@ -57,9 +57,6 @@ m4_pattern_forbid([^jm_])
m4_pattern_allow([^jm_cv_])
m4_pattern_allow([^jm_ac_cv_])
-pkglibexecdir='${libexecdir}'/$PACKAGE
-AC_SUBST([pkglibexecdir])
-
AC_MSG_CHECKING(for modules to preload)
m4_pattern_allow([^m4_default_preload$])
m4_default_preload="m4 traditional gnu"
Index: m4/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/m4/Makefile.am,v
retrieving revision 1.24
diff -u -p -u -r1.24 Makefile.am
--- m4/Makefile.am 12 Sep 2003 13:27:54 -0000 1.24
+++ m4/Makefile.am 12 Sep 2003 13:47:11 -0000
@@ -26,10 +26,9 @@ libm4_la_SOURCES = builtin.c debug.c ha
path.c symtab.c syntax.c utility.c
libm4_la_LIBADD = $(top_builddir)/gnulib/m4/libgnu.la
$(LIBADD_DL)
-MODULE_PATH = $(pkglibexecdir)
module.o module.lo: module.c pathconf.h
pathconf.h: Makefile
- @echo "#define MODULE_PATH \"${MODULE_PATH}\"" > pathconf.h
+ @echo "#define MODULE_PATH \"$(libexecdir)/$(PACKAGE)\"" > pathconf.h
EXTRA_DIST = system_.h
# This file needs to be regenerated at configure time.
Index: modules/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/modules/Makefile.am,v
retrieving revision 1.23
diff -u -p -u -r1.23 Makefile.am
--- modules/Makefile.am 5 Sep 2003 18:32:26 -0000 1.23
+++ modules/Makefile.am 12 Sep 2003 13:47:11 -0000
@@ -21,8 +21,9 @@
DISTCLEANFILES = perlxsi.c
MAINTAINERCLEANFILES = Makefile.in
-testsubdir = testSubDir
-pkgmodincdir = $(includedir)/@PACKAGE@/modules
+testsubdir = testSubDir
+pkgmodincludedir = $(includedir)/$(PACKAGE)/modules
+pkglibexecdir = $(libexecdir)/$(PACKAGE)
ETAGS_ARGS = --regex='/M4BUILTIN_HANDLER[ \t]*(\([^)]*\)/\1/'
@@ -34,7 +35,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_
LIBS = $(top_builddir)/m4/libm4.la
AM_LDFLAGS = -no-undefined
-pkgmodinc_HEADERS = m4.h
+pkgmodinclude_HEADERS = m4.h
pkglibexec_LTLIBRARIES = gnu.la load.la m4.la \
traditional.la perl.la \
modtest.la shadow.la import.la stdlib.la time.la
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: 64-gary-set-pkglibexecdir-at-make-time.patch,
Gary V. Vaughan <=