summaryrefslogtreecommitdiff
path: root/x11/lesstif/patches/patch-af
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-06-30 19:08:21 +0000
committerjlam <jlam@pkgsrc.org>2001-06-30 19:08:21 +0000
commite5bae2d5801fc2d6c49ccee9ca16e0dde402f16c (patch)
tree14500fc61e697f795ae42b50eb1cda1be128fcf7 /x11/lesstif/patches/patch-af
parent257758c1da74ccac881590408c314a341e294cee (diff)
downloadpkgsrc-e5bae2d5801fc2d6c49ccee9ca16e0dde402f16c.tar.gz
Update lesstif and lesstif12 to 0.92.32. Changes from version 0.92.26
include: Small code fixes to help building on some systems Use new libtool version 1.4 and automake 1.4-p1 Install more machine-indepedent files in $(prefix)
Diffstat (limited to 'x11/lesstif/patches/patch-af')
-rw-r--r--x11/lesstif/patches/patch-af23
1 files changed, 13 insertions, 10 deletions
diff --git a/x11/lesstif/patches/patch-af b/x11/lesstif/patches/patch-af
index 66ec0ac579f..2414daedafa 100644
--- a/x11/lesstif/patches/patch-af
+++ b/x11/lesstif/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.13 2000/12/22 17:26:19 jlam Exp $
+$NetBSD: patch-af,v 1.14 2001/06/30 19:08:23 jlam Exp $
---- clients/Motif-2.0/mwm/Makefile.am.orig Tue Dec 19 05:47:42 2000
+--- clients/Motif-2.0/mwm/Makefile.am.orig Tue May 1 08:37:20 2001
+++ clients/Motif-2.0/mwm/Makefile.am
@@ -4,8 +4,12 @@
@@ -8,20 +8,23 @@ $NetBSD: patch-af,v 1.13 2000/12/22 17:26:19 jlam Exp $
bin_PROGRAMS= mwm
-endif
+if DefaultVersion20
-+bindir = $(prefix)/bin
++bindir = $(exec_prefix)/bin
+else
- bindir = $(prefix)/LessTif/Motif2.0/bin
+ bindir = $(exec_prefix)/LessTif/Motif2.0/bin
+endif
+endif
MAINTAINERCLEANFILES=Makefile.in mwmlex.c mwmparse.c mwmparse.h
-@@ -59,10 +63,12 @@
- LDADD= ../../../lib/Xm-2.0/libXm.la \
- $(X_LIBS) -lXt $(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS)
+@@ -34,6 +38,7 @@
+ # non-local stuff
+ BUILT_SOURCES = $(HDRS_1_2) $(SRCS_1_2) $(mwmd_DATA) Mwm.ad
+if Version_2_0
- appdir= $(libdir)/X11/app-defaults
+ mwm_SOURCES = $(HDRS_1_2) $(SRCS_1_2) $(HDRS_2_0) $(SRCS_2_0)
+
+ $(SRCS_1_2) $(HDRS_1_2):
+@@ -63,6 +68,7 @@
mwmddir= $(libdir)/X11/mwm
mwmd_DATA= system.mwmrc alt.map README
@@ -36,8 +39,8 @@ $NetBSD: patch-af,v 1.13 2000/12/22 17:26:19 jlam Exp $
-
-install-data-hook:
-if DefaultVersion20
-- -rm -f $(DESTDIR)$(prefix)/bin/$(bin_PROGRAMS)
-- (cd $(DESTDIR)$(prefix)/bin && $(LN_S) ../LessTif/Motif2.0/bin/$(bin_PROGRAMS) .)
+- -rm -f $(DESTDIR)$(exec_prefix)/bin/$(bin_PROGRAMS)
+- (cd $(DESTDIR)$(exec_prefix)/bin && $(LN_S) ../LessTif/Motif2.0/bin/$(bin_PROGRAMS) .)
-endif
install-data-local: