Hi,
I would like to suggest the attached patch for lesstif-0.93.36. Everything
in this patch appears twice, once in Makefile.am and once in Makefile.in
since I wanted to avoid to rerun automake&Co which only would have lead to
tremendous and unintelligible diffs.
Two comments:
The modifications are irrelevant all long as exec_prefix=${prefix} and
includedir=${prefix}/include, both of which are the defaults.
I someone deviates from these defaults (as I did) I think that all the
documentation directories should be based on prefix instead of exec_prefix,
and the Dt includes should certainly go to a sibling directory of the other
(Mrm, Xm, and uil) includes.
===============================
Oops: I just saw the the other Makefile.{am,in}'s in the directories
include/Motif-{1.2,2.0,2.1}/{Xm,Mrm,uil} all use
mrmdir = $(prefix)/include/Mrm
or similar. I think, all these occurences of
$(prefix)/include
ought to be replaced by
$(includedir)
such that a user can override this via 'configure --includedir=<whatever>'
regards
Peter Breitenlohner <[EMAIL PROTECTED]>
diff -ur lesstif-0.93.36.orig/doc/lessdox/clients/Makefile.am
lesstif-0.93.36/doc/lessdox/clients/Makefile.am
--- lesstif-0.93.36.orig/doc/lessdox/clients/Makefile.am 2002-05-18
18:50:18.000000000 +0200
+++ lesstif-0.93.36/doc/lessdox/clients/Makefile.am 2002-11-13 13:14:55.000000000
++0100
@@ -6,17 +6,17 @@
EXTRA_DIST = $(manone_DATA) $(manthree_DATA) $(manfive_DATA)
SUFFIXES= .1 .3 .5 .html
-mandir= $(exec_prefix)/LessTif/doc/man
-manonedir= $(exec_prefix)/man/man1
-manthreedir= $(exec_prefix)/man/man3
-manfivedir= $(exec_prefix)/man/man5
+mandir= $(prefix)/LessTif/doc/man
+manonedir= $(prefix)/man/man1
+manthreedir= $(prefix)/man/man3
+manfivedir= $(prefix)/man/man5
manone_DATA= mwm.1 xmbind.1 lesstif.1 uil.1 ltversion.1
manthree_DATA=
manfive_DATA= mwmrc.5 VirtualBindings.5
-htmldir= $(exec_prefix)/LessTif/doc/html
+htmldir= $(prefix)/LessTif/doc/html
html_DATA= mwm.html mwmrc.html xmbind.html lesstif.html uil.html \
VirtualBindings.html
diff -ur lesstif-0.93.36.orig/doc/lessdox/clients/Makefile.in
lesstif-0.93.36/doc/lessdox/clients/Makefile.in
--- lesstif-0.93.36.orig/doc/lessdox/clients/Makefile.in 2002-08-06
11:52:13.000000000 +0200
+++ lesstif-0.93.36/doc/lessdox/clients/Makefile.in 2002-11-13 13:15:00.000000000
++0100
@@ -69,7 +69,7 @@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
-mandir = $(exec_prefix)/LessTif/doc/man
+mandir = $(prefix)/LessTif/doc/man
ACLOCALDIR = @ACLOCALDIR@
AMTAR = @AMTAR@
AR = @AR@
@@ -141,15 +141,15 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = $(manone_DATA) $(manthree_DATA) $(manfive_DATA)
SUFFIXES = .1 .3 .5 .html
-manonedir = $(exec_prefix)/man/man1
-manthreedir = $(exec_prefix)/man/man3
-manfivedir = $(exec_prefix)/man/man5
+manonedir = $(prefix)/man/man1
+manthreedir = $(prefix)/man/man3
+manfivedir = $(prefix)/man/man5
manone_DATA = mwm.1 xmbind.1 lesstif.1 uil.1 ltversion.1
manthree_DATA =
manfive_DATA = mwmrc.5 VirtualBindings.5
-htmldir = $(exec_prefix)/LessTif/doc/html
+htmldir = $(prefix)/LessTif/doc/html
html_DATA = mwm.html mwmrc.html xmbind.html lesstif.html uil.html \
VirtualBindings.html
diff -ur lesstif-0.93.36.orig/doc/lessdox/functions/Makefile.am
lesstif-0.93.36/doc/lessdox/functions/Makefile.am
--- lesstif-0.93.36.orig/doc/lessdox/functions/Makefile.am 2002-05-18
18:50:18.000000000 +0200
+++ lesstif-0.93.36/doc/lessdox/functions/Makefile.am 2002-11-13 13:15:58.000000000
++0100
@@ -6,17 +6,17 @@
EXTRA_DIST = $(manone_DATA) $(manthree_DATA) $(manfive_DATA)
SUFFIXES= .1 .3 .5 .html
-mandir= $(exec_prefix)/LessTif/doc/man
-manonedir= $(exec_prefix)/man/man1
-manthreedir= $(exec_prefix)/man/man3
-manfivedir= $(exec_prefix)/man/man5
+mandir= $(prefix)/LessTif/doc/man
+manonedir= $(prefix)/man/man1
+manthreedir= $(prefix)/man/man3
+manfivedir= $(prefix)/man/man5
manone_DATA=
manthree_DATA=
manfive_DATA=
-htmldir= $(exec_prefix)/LessTif/doc/html
+htmldir= $(prefix)/LessTif/doc/html
html_DATA= ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \
${manfive_DATA:.5=.html}
diff -ur lesstif-0.93.36.orig/doc/lessdox/functions/Makefile.in
lesstif-0.93.36/doc/lessdox/functions/Makefile.in
--- lesstif-0.93.36.orig/doc/lessdox/functions/Makefile.in 2002-08-06
11:52:13.000000000 +0200
+++ lesstif-0.93.36/doc/lessdox/functions/Makefile.in 2002-11-13 13:16:01.000000000
++0100
@@ -69,7 +69,7 @@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
-mandir = $(exec_prefix)/LessTif/doc/man
+mandir = $(prefix)/LessTif/doc/man
ACLOCALDIR = @ACLOCALDIR@
AMTAR = @AMTAR@
AR = @AR@
@@ -141,15 +141,15 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = $(manone_DATA) $(manthree_DATA) $(manfive_DATA)
SUFFIXES = .1 .3 .5 .html
-manonedir = $(exec_prefix)/man/man1
-manthreedir = $(exec_prefix)/man/man3
-manfivedir = $(exec_prefix)/man/man5
+manonedir = $(prefix)/man/man1
+manthreedir = $(prefix)/man/man3
+manfivedir = $(prefix)/man/man5
manone_DATA =
manthree_DATA =
manfive_DATA =
-htmldir = $(exec_prefix)/LessTif/doc/html
+htmldir = $(prefix)/LessTif/doc/html
html_DATA = ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \
${manfive_DATA:.5=.html}
diff -ur lesstif-0.93.36.orig/doc/lessdox/widgets/Makefile.am
lesstif-0.93.36/doc/lessdox/widgets/Makefile.am
--- lesstif-0.93.36.orig/doc/lessdox/widgets/Makefile.am 2002-05-18
18:50:18.000000000 +0200
+++ lesstif-0.93.36/doc/lessdox/widgets/Makefile.am 2002-11-13 13:17:30.000000000
++0100
@@ -6,10 +6,10 @@
EXTRA_DIST = $(manone_DATA) $(manthree_DATA) $(manfive_DATA)
SUFFIXES= .1 .3 .5 .html
-mandir= $(exec_prefix)/LessTif/doc/man
-manonedir= $(exec_prefix)/man/man1
-manthreedir= $(exec_prefix)/man/man3
-manfivedir= $(exec_prefix)/man/man5
+mandir= $(prefix)/LessTif/doc/man
+manonedir= $(prefix)/man/man1
+manthreedir= $(prefix)/man/man3
+manfivedir= $(prefix)/man/man5
manone_DATA=
manthree_DATA= \
@@ -40,7 +40,7 @@
manfive_DATA=
-htmldir= $(exec_prefix)/LessTif/doc/html
+htmldir= $(prefix)/LessTif/doc/html
html_DATA= ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \
${manfive_DATA:.5=.html}
@@ -67,4 +67,4 @@
# in both the http://www.lesstif.org and the locally installed case.
#
install-data-hook:
- if [ ! -h $(DESTDIR)$(exec_prefix)/LessTif/doc/Lessdox ]; then mkdir -p
$(DESTDIR)$(exec_prefix)/LessTif/doc && cd $(DESTDIR)$(exec_prefix)/LessTif/doc &&
$(LN_S) html Lessdox; fi
+ if [ ! -h $(DESTDIR)$(prefix)/LessTif/doc/Lessdox ]; then mkdir -p
+$(DESTDIR)$(prefix)/LessTif/doc && cd $(DESTDIR)$(prefix)/LessTif/doc && $(LN_S) html
+Lessdox; fi
diff -ur lesstif-0.93.36.orig/doc/lessdox/widgets/Makefile.in
lesstif-0.93.36/doc/lessdox/widgets/Makefile.in
--- lesstif-0.93.36.orig/doc/lessdox/widgets/Makefile.in 2002-08-06
11:52:14.000000000 +0200
+++ lesstif-0.93.36/doc/lessdox/widgets/Makefile.in 2002-11-13 13:17:32.000000000
++0100
@@ -69,7 +69,7 @@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
-mandir = $(exec_prefix)/LessTif/doc/man
+mandir = $(prefix)/LessTif/doc/man
ACLOCALDIR = @ACLOCALDIR@
AMTAR = @AMTAR@
AR = @AR@
@@ -141,9 +141,9 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = $(manone_DATA) $(manthree_DATA) $(manfive_DATA)
SUFFIXES = .1 .3 .5 .html
-manonedir = $(exec_prefix)/man/man1
-manthreedir = $(exec_prefix)/man/man3
-manfivedir = $(exec_prefix)/man/man5
+manonedir = $(prefix)/man/man1
+manthreedir = $(prefix)/man/man3
+manfivedir = $(prefix)/man/man5
manone_DATA =
manthree_DATA = \
@@ -175,7 +175,7 @@
manfive_DATA =
-htmldir = $(exec_prefix)/LessTif/doc/html
+htmldir = $(prefix)/LessTif/doc/html
html_DATA = ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \
${manfive_DATA:.5=.html}
@@ -425,7 +425,7 @@
# in both the http://www.lesstif.org and the locally installed case.
#
install-data-hook:
- if [ ! -h $(DESTDIR)$(exec_prefix)/LessTif/doc/Lessdox ]; then mkdir -p
$(DESTDIR)$(exec_prefix)/LessTif/doc && cd $(DESTDIR)$(exec_prefix)/LessTif/doc &&
$(LN_S) html Lessdox; fi
+ if [ ! -h $(DESTDIR)$(prefix)/LessTif/doc/Lessdox ]; then mkdir -p
+$(DESTDIR)$(prefix)/LessTif/doc && cd $(DESTDIR)$(prefix)/LessTif/doc && $(LN_S) html
+Lessdox; fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -ur lesstif-0.93.36.orig/lib/Dt/Makefile.am lesstif-0.93.36/lib/Dt/Makefile.am
--- lesstif-0.93.36.orig/lib/Dt/Makefile.am 2001-08-29 21:21:46.000000000 +0200
+++ lesstif-0.93.36/lib/Dt/Makefile.am 2002-11-13 14:40:28.000000000 +0100
@@ -16,7 +16,7 @@
# libDtPrint_la_LIBADD = @X_LIBS@ -lXt $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
-dtincludedir= $(exec_prefix)/include/Dt
+dtincludedir= $(includedir)/Dt
dtinclude_DATA= Print.h
INCLUDES= -I$(top_srcdir)/lib \
diff -ur lesstif-0.93.36.orig/lib/Dt/Makefile.in lesstif-0.93.36/lib/Dt/Makefile.in
--- lesstif-0.93.36.orig/lib/Dt/Makefile.in 2002-08-06 11:52:22.000000000 +0200
+++ lesstif-0.93.36/lib/Dt/Makefile.in 2002-11-13 14:40:32.000000000 +0100
@@ -147,7 +147,7 @@
# libDtPrint_la_LIBADD = @X_LIBS@ -lXt $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
-@BuildLibDtPrint_TRUE@dtincludedir = $(exec_prefix)/include/Dt
+@BuildLibDtPrint_TRUE@dtincludedir = $(includedir)/Dt
@BuildLibDtPrint_TRUE@dtinclude_DATA = Print.h
@BuildLibDtPrint_TRUE@INCLUDES = -I$(top_srcdir)/lib \
